Scar and Tattoo Fixes

Resources/Locale/en-US/markings/scars.ftl

@@ -10,5 +10,8 @@ marking-ScarTopSurgeryShort = Top Surgery Scar (Short)
 marking-ScarTopSurgeryLong-scar_top_surgery_long = Top Surgery Scar
 marking-ScarTopSurgeryLong = Top Surgery Scar (Long)
 
-marking-ScarChest-scar_chest = Chest Scar
-marking-ScarChest = Chest Scar
+marking-ScarChestMale-scar_chest_male = Chest Scar
+marking-ScarChestMale = Chest Scar
+
+marking-ScarChestFemale-scar_chest_female = Chest Scar
+marking-ScarChestFemale = Chest Scar

Resources/Locale/en-US/markings/tattoos.ftl

@@ -1,8 +1,14 @@
-marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive)
-marking-TattooHiveChest = Back Tattoo (Hive)
+marking-TattooHiveChestMale-tattoo_hive_chest_male = Back Tattoo (Hive)
+marking-TattooHiveChestMale = Back Tattoo (Hive)
 
-marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (nightling)
-marking-TattooNightlingChest = Chest Tattoo (Nightling)
+marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive)
+marking-TattooHiveChestFemale = Back Tattoo (Hive)
+
+marking-TattooNightlingChestMale-tattoo_nightling_male = Chest Tattoo (Nightling)
+marking-TattooNightlingChestMale = Chest Tattoo (Nightling)
+
+marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling)
+marking-TattooNightlingChestFemale = Chest Tattoo (Nightling)
 
 marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg)
 marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg)

Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml

@@ -41,11 +41,23 @@
     state: scar_top_surgery_long
 
 - type: marking
-  id: ScarChest
+  id: ScarChestMale
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
+  sexRestriction: [Male]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest_male
+
+- type: marking
+  id: ScarChestFemale
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
+  sexRestriction: [Female]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
-    state: scar_chest
+    state: scar_chest_female

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -1,30 +1,62 @@
 - type: marking
-  id: TattooHiveChest
+  id: TattooHiveChestMale
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Male]
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_hive_chest
+    state: tattoo_hive_chest_male
 
 - type: marking
-  id: TattooNightlingChest
+  id: TattooHiveChestFemale
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Female]
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_nightling
+    state: tattoo_hive_chest_female
+
+- type: marking
+  id: TattooNightlingChestMale
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Male]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_nightling_male
+
+- type: marking
+  id: TattooNightlingChestFemale
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Female]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_nightling_female
 
 - type: marking
   id: TattooSilverburghLeftLeg

Resources/Textures/Mobs/Customization/scars.rsi/meta.json

@@ -24,7 +24,11 @@
         "directions": 4
     },
     {
-        "name": "scar_chest",
+        "name": "scar_chest_male",
+        "directions": 4
+    },
+    {
+        "name": "scar_chest_female",
         "directions": 4
     }
   ]

Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json

@@ -8,11 +8,19 @@
   },
   "states": [
     {
-      "name": "tattoo_hive_chest",
+      "name": "tattoo_hive_chest_male",
       "directions": 4
     },
     {
-      "name": "tattoo_nightling",
+      "name": "tattoo_hive_chest_female",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling_male",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling_female",
       "directions": 4
     },
     {