- head sprites can be given "tags", and body is chosen from sprites with the same tag

- black character sprites

Subsurface/Barotrauma.csproj

@@ -374,6 +374,21 @@
     <Content Include="Content\Characters\Fractalguardian\fractalguardian.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Characters\Human\fhead7[black].png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Characters\Human\ftorso[black].png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Characters\Human\head7[black].png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Characters\Human\head8[black].png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Characters\Human\torso[black].png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Characters\Husk\DivingSuit.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Subsurface/Content/Characters/Human/human.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Character name ="human" humanoid="true" needsair="true" genders="true" maleheadid="1,6" femaleheadid="1,6" drowningtime="30">
+<Character name ="human" humanoid="true" needsair="true" genders="true" maleheadid="1,8" femaleheadid="1,7" drowningtime="30">
 
   <name firstname="Content/Characters/Human/[GENDER]firstnames.txt" lastname="Content/Characters/Human/lastnames.txt" />
   

Subsurface/Source/Characters/CharacterHUD.cs

@@ -179,7 +179,7 @@ namespace Barotrauma
                     new Vector2(GameMain.GraphicsWidth / damageOverlay.size.X, GameMain.GraphicsHeight / damageOverlay.size.Y));
             }
 
-            if (character.IsUnconscious)
+            if (character.IsUnconscious && !character.IsDead)
             {
                 if (suicideButton == null)
                 {

Subsurface/Source/Characters/CharacterInfo.cs

@@ -2,6 +2,8 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -45,6 +47,12 @@ namespace Barotrauma
             }
         }
 
+        public List<string> SpriteTags
+        {
+            get;
+            private set;
+        }
+
         public int HeadSpriteId
         {
             get { return headSpriteId; }
@@ -92,6 +100,8 @@ namespace Barotrauma
 
             pickedItems = new List<ushort>();
 
+            SpriteTags = new List<string>();
+
             //ID = -1;
 
             XDocument doc = ToolBox.TryLoadXml(file);
@@ -171,8 +181,30 @@ namespace Barotrauma
 
                 spritePath = spritePath.Replace("[GENDER]", (this.gender == Gender.Female) ? "f" : "");
                 spritePath = spritePath.Replace("[HEADID]", HeadSpriteId.ToString());
-                
-                headSprite = new Sprite(spriteElement, "", spritePath);
+
+                string fileName = Path.GetFileNameWithoutExtension(spritePath);
+
+                //go through the files in the directory to find a matching sprite
+                var files = Directory.GetFiles(Path.GetDirectoryName(spritePath)).ToList();
+                foreach (string file in files)
+                {
+                    string fileWithoutTags = Path.GetFileNameWithoutExtension(file);
+                    fileWithoutTags = fileWithoutTags.Split('[', ']').First();
+
+                    if (fileWithoutTags != fileName) continue;
+                    
+                    headSprite = new Sprite(spriteElement, "", file);
+
+                    //extract the tags out of the filename
+                    SpriteTags = file.Split('[', ']').Skip(1).ToList();
+                    if (SpriteTags.Any())
+                    {
+                        SpriteTags.RemoveAt(SpriteTags.Count-1);
+                    }
+
+                    break;                    
+                }
+
                 break;
             }
         }

Subsurface/Source/Characters/Limb.cs

@@ -8,6 +8,8 @@ using Microsoft.Xna.Framework.Graphics;
 using Barotrauma.Items.Components;
 using System.Collections.Generic;
 using Barotrauma.Lights;
+using System.Linq;
+using System.IO;
 
 namespace Barotrauma
 {
@@ -273,14 +275,34 @@ namespace Barotrauma
                     case "sprite":
                         string spritePath = subElement.Attribute("texture").Value;
 
-                        if (character.Info!=null)
+                        string spritePathWithTags = spritePath;
+
+                        if (character.Info != null)
                         {
                             spritePath = spritePath.Replace("[GENDER]", (character.Info.Gender == Gender.Female) ? "f" : "");
                             spritePath = spritePath.Replace("[HEADID]", character.Info.HeadSpriteId.ToString());
+
+                            if (character.Info.HeadSprite != null && character.Info.SpriteTags.Any())
+                            {
+                                string tags = "";
+                                character.Info.SpriteTags.ForEach(tag => tags += "[" + tag + "]");
+
+                                spritePathWithTags = Path.Combine(
+                                    Path.GetDirectoryName(spritePath),
+                                    Path.GetFileNameWithoutExtension(spritePath) + tags + Path.GetExtension(spritePath));
+                            }
                         }
 
+                        if (File.Exists(spritePathWithTags))
+                        {
+                            sprite = new Sprite(subElement, "", spritePathWithTags);
+                        }
+                        else
+                        {
+
+                            sprite = new Sprite(subElement, "", spritePath);
+                        }
 
-                        sprite = new Sprite(subElement, "", spritePath);
                         break;
                     case "damagedsprite":
                         string damagedSpritePath = subElement.Attribute("texture").Value;