From f72a1a0edb5f28bc9c83e5fe484b77cce0b7d8a0 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sun, 18 Feb 2024 07:50:39 +1100
Subject: [PATCH] Clean up scars.yml and add a new chest scar (#25215)

add
---
 Resources/Locale/en-US/markings/scars.ftl     |   3 ++
 .../Mobs/Customization/Markings/scars.yml     |  26 ++++++++++--------
 .../Mobs/Customization/scars.rsi/meta.json    |   4 +++
 .../Customization/scars.rsi/scar_chest.png    | Bin 0 -> 1410 bytes
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png

diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index 57047731d1..fae2ffe887 100644
--- 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 097675efa7..37d6ebe279 100644
--- 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 c3bfd498d6..0a323f7f65 100644
--- 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
index 0000000000000000000000000000000000000000..9a1cc56c5eaaefd41a959e81287b35d6c1f8ebe4
GIT binary patch
literal 1410
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq
ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~%
zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?x<p{1pzzJZaxk&!M?g>G?W
zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$
z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F
zXfoK|;*u17BnA3L1_l<o21dF@milo20iAD?l5ACyS(1|q4mh}fz#-_EQ-UfAQV$A(
zoJ>&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2l%uT3XuZLsX&ahKQmXYNL<EejAXlts;X`
zi}Q0zLE&y^X=(!w3KT&^1VA)IVAFssh^`?ZBflgcn4XF<lRfiFQi}?TfN2YCpApnL
z+$zw`Lf9Remsw&5GXPB(Nf%PwSUDDzl;;;^hk)Y&5r{aIK#hR}C{p@_Bz|z<15>{p
zmyJF=C)sg{E@QC<X4$EpE{-7;jBjrl<{dH+X-K@hGgiZ!J#5`2?k@~;Ef|@txrOF5
ztYm+2ZRuWaX>ayJOdMOgS5JQx87CEVT&?u8^1_I&x6i*@e*BcgW6vVsz`zJ18uPfm
zBrW-CA{RaPdEwSBqvhwG#|IzT`H8t@OMIGf_1*W<f7{OlruV3<H_U5y{=6;5>WkIm
z`d61Z947s@kh^=Q{qDJ~$>#6els_BH|E|(@<d4nVMT#uzLm9qoteNMx_>ITaB$H`z
zs&%3NpL{pT-1%zJB=)aNTLdq+UM~+=w^r}ST8%Y=HEeIT-!@vbr(4ti--a!(`nlLH
zFt5Ln^UD3VzHPL9jgk|aE#urfUprp-v@$SpC^TRr9K4xM+NJFXu?w1g#b|EG>LR_%
ze{cD4Z~1p%4)@kNx%AuXyIZe*`g8M~sBDv0vgqg7C)3{iS*Wq-$SFRDN&DyfoZ9TI
zeZ^O06LUrU`qMS}Y|R?%ab*nG>gvUo2>6!Szuq|4^6ln(s$%`fme+?p;I_Em!PqUO
R@eNe|dAj<!taD0e0szzP+f@Jn

literal 0
HcmV?d00001

-- 
2.52.0