Clean up scars.yml and add a new chest scar (#25215)

add

diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index 57047731d1a742cadd23ef4a11497bbd4ee42eb2..fae2ffe8873ddeeb3d8cb8b3f13c9ec8d29aae6c 100644 (file)
--- a/Resources/Locale/en-US/markings/scars.ftl
+++ b/Resources/Locale/en-US/markings/scars.ftl
@@ -9,3 +9,6 @@ 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

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index 097675efa76d6d2f8c671cc3d5760a9f678748e2..37d6ebe279ff9354cca0640a5c2f263892c581e4 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -3,11 +3,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf]
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_right
@@ -17,11 +13,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf]
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_left
@@ -30,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -41,9 +33,19 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_top_surgery_long
+
+- type: marking
+  id: ScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest

diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
index c3bfd498d698199dd7ec61691c5187063a51381d..0a323f7f65d38879a12edcbb906d828d55b3922d 100644 (file)
--- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -22,6 +22,10 @@
     {
         "name": "scar_top_surgery_long",
         "directions": 4
+    },
+    {
+        "name": "scar_chest",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png
new file mode 100644 (file)
index 0000000..9a1cc56
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png differ