Scar and Tattoo Fixes (#1889)

* Update tattoos.yml

Fixes chest tattoos showing through clothes on females. 

Signed-off-by: Aikakakah <[email protected]>

* Update scars.yml

Fixes the chest scar showing through clothes on females. 

Signed-off-by: Aikakakah <[email protected]>

* Add files via upload

Signed-off-by: Aikakakah <[email protected]>

* Delete Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png

Signed-off-by: Aikakakah <[email protected]>

* Update meta.json

Signed-off-by: Aikakakah <[email protected]>

* Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png

Signed-off-by: Aikakakah <[email protected]>

* Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png

Signed-off-by: Aikakakah <[email protected]>

* Add files via upload

Signed-off-by: Aikakakah <[email protected]>

* Update meta.json

Signed-off-by: Aikakakah <[email protected]>

* Update tattoos.ftl

Signed-off-by: Aikakakah <[email protected]>

* Update scars.ftl

Signed-off-by: Aikakakah <[email protected]>

* Commented changes to denote DeltaV

* Edited scars and tattoo.ftl

* Moved female variants to DeltaV namespace, fixed comments on others.

---------

Signed-off-by: Aikakakah <[email protected]>

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

@@ -0,0 +1,2 @@
+marking-ScarChestFemale-scar_chest_female = Chest Scar
+marking-ScarChestFemale = Chest Scar

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

@@ -0,0 +1,8 @@
+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)

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

@@ -1,7 +1,7 @@
 marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive)
 marking-TattooHiveChest = Back Tattoo (Hive)
 
-marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (nightling)
+marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (Nightling)
 marking-TattooNightlingChest = Chest Tattoo (Nightling)
 
 marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg)

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

@@ -0,0 +1,10 @@
+- type: marking
+  id: ScarChestFemale #DeltaV: Splitting the scars and tattoos
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
+  followSkinColor: true
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/scars.rsi
+    state: scar_chest_female

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

@@ -0,0 +1,29 @@
+- type: marking
+  id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi
+    state: tattoo_hive_chest_female
+
+- type: marking
+  id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi
+    state: tattoo_nightling_female

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

@@ -45,7 +45,9 @@
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_chest
+

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

@@ -3,6 +3,7 @@
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
@@ -17,13 +18,14 @@
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi #DeltaV: Splitting the scars and tattoos
     state: tattoo_nightling
 
 - type: marking

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

@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser, modified by Aikakakah",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+          "name": "scar_chest_female",
+          "directions": 4
+      }
+    ]
+  }
+

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

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "tattoo_hive_chest_female",
+        "directions": 4
+      },
+      {
+        "name": "tattoo_nightling",
+        "directions": 4
+      },
+      {
+        "name": "tattoo_nightling_female",
+        "directions": 4
+      }
+    ]
+  }