From 3bf38a4d464633d84b6fa05c4df46d7ff750f398 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:26:31 +0100 Subject: [PATCH] More scars! (#35644) * :3 * whitespace, stomach scar --- Resources/Locale/en-US/markings/scars.ftl | 15 ++++++ .../Mobs/Customization/Markings/scars.yml | 50 ++++++++++++++++++ .../Mobs/Customization/scars.rsi/meta.json | 22 +++++++- .../scars.rsi/scar_chest_bullets.png | Bin 0 -> 508 bytes .../Customization/scars.rsi/scar_face_1.png | Bin 0 -> 560 bytes .../Customization/scars.rsi/scar_face_2.png | Bin 0 -> 499 bytes .../Customization/scars.rsi/scar_neck.png | Bin 0 -> 438 bytes .../scars.rsi/scar_stomach_bullets.png | Bin 0 -> 451 bytes 8 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_face_2.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_neck.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_stomach_bullets.png diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index fae2ffe887..f31f054911 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -12,3 +12,18 @@ marking-ScarTopSurgeryLong = Top Surgery Scar (Long) marking-ScarChest-scar_chest = Chest Scar marking-ScarChest = Chest Scar + +marking-ScarNeck-scar_neck = Neck Scar +marking-ScarNeck = Neck Scar + +marking-ScarChestBullets-scar_chest_bullets = Bullet Holes Scar +marking-ScarChestBullets = Chest Scar (Bullets) + +marking-ScarStomachBullets-scar_stomach_bullets = Bullet Holes Scar +marking-ScarStomachBullets = Stomach Scar (Bullets) + +marking-ScarFace1-scar_face_1 = Face Scar +marking-ScarFace1 = Face Scar (Large) + +marking-ScarFace2-scar_face_2 = Face Scar +marking-ScarFace2 = Face Scar (Small) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 37d6ebe279..4de3b59182 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -49,3 +49,53 @@ sprites: - sprite: Mobs/Customization/scars.rsi state: scar_chest + +- type: marking + id: ScarNeck + bodyPart: Head + markingCategory: Head + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_neck + +- type: marking + id: ScarChestBullets + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_chest_bullets + +- type: marking + id: ScarStomachBullets + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_stomach_bullets + +- type: marking + id: ScarFace1 + bodyPart: Head + markingCategory: Head + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_face_1 + +- type: marking + id: ScarFace2 + bodyPart: Head + markingCategory: Head + speciesRestriction: [Human, Dwarf] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_face_2 \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json index 0a323f7f65..9bc0d3263e 100644 --- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser", + "copyright": "scar_chest, scar_eye_left, scar_eye_right, scar_top_surgery_long and scar_top_surgery_short drawn by Ubaser, scar_neck, scar_chest_bullets, scar_stomach_bullets, scar_face_1 and scar_face_2 drawn by Ktyria(discord)", "size": { "x": 32, "y": 32 @@ -26,6 +26,26 @@ { "name": "scar_chest", "directions": 4 + }, + { + "name": "scar_neck", + "directions": 4 + }, + { + "name": "scar_chest_bullets", + "directions": 4 + }, + { + "name": "scar_stomach_bullets", + "directions": 4 + }, + { + "name": "scar_face_1", + "directions": 4 + }, + { + "name": "scar_face_2", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest_bullets.png new file mode 100644 index 0000000000000000000000000000000000000000..975e5cf6e7f7f8a4738be193463323237e80637f GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yUfB|3Aa^Q@lX644efXk;M!Qe1}1p z@p%4<6ri9)iEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r$J(EVl2KsDP^BRtbQJ+&A( zfE-o^DMnTXMj*=zh^3)ykc%}KnZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6 zWngAtn841!0#spOWNg5=0Aeag2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UE2KijRi z_gVZFAhX@m#W5tp{p~bIz5@yzEK~p6?^=_2nZYZ|$AjN``mv_Nx4LtSI9Np*K7_Mn$jM5k@MQ@a0$o5M#Uu;&u661x_aZak)+#MzZ19Y z9T{00n79~#+I=1WIBWPVxSP)TCGP9=@{fW^4Y`gl^zEI%@=D@&gyc^(&X^C1BL+`b KKbLh*2~7YG<$$38 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_face_1.png new file mode 100644 index 0000000000000000000000000000000000000000..66cff8c5471ba9c078208fddbab4be4e01d115eb GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwE=WszdhGQ6i4)gURBUc;{`v0HtDAR#lH5C)PXH;7k|4j}{}8}% zuX%4IP>i#{BeIx*f$uN~Gak=hkpeQT#5JNMI6tkVJh3R1As{g`uSCz!HAKNw&rr`q z=>D>1pqg!|5uRzDo>~kXKn^Q|6eBAGBar0<#L`eU$QK%n%wTaQAls0Ui9rBJM*(qW zI}2Dm3&;k61Rw_KhtX)3GB7hROkihV0je-CGB#jb05KJ$gLMJKq$xl)2rvQ7VFIfR zva|rQpt=kV3_!BipY2xM`z(G7kh$E`#W5tp{q3~Vd@TkXu9cbp|M$0g8hdt!c5a?= z)Rx=T+kawjKs6`Je>DZM{an+RI2(1EU5pA$-Zn8X_kT#^%o$(X+k2jK=123-H{#lH zpIc#ZYwm;z&^ZoCLPu;evoV@=JAhtq$yE|1~i*k>`_ zfV<{UgxG_dm8Pki-`ZLwZohK0=FX;8`MlW?Y)l+X910w9Tv65xZuj!)kKf$16XbkP LS3j3^P6`6&$?5<8fySlIX){;^owGcEtRD^j-q>ie?WI^Tbn{eN1J z@$P!|q38GALMA@=oOj(OZ@bCNvqEtj_ie0v@h*pf!{Kqn;*S=4=biud*FU!0uDfxX z(nSRZ-si^~7fuY~b!D3(mV8H@St7XeiVBm`-Ly5TOq8?NnAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X( z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U ztTM>b0?2~uGBhv%$zFf9TXFBR_$@$Ys;7%%NJZS+TZUXM4gxF(cDmd+ez)GI=bLq! zou7fEpjntm$d1)s%ND=m_hDf8u-xwLJhQ8_Vl_9ODXwXMSi}!94hUpUpSh&8Uh=nH rbj=y**}J#3cZ%hIenAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X( z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U ztTM>b0?2~uGBhv%$zFf9TXFBR_$@$Yk*AAeNJZS+TZViM3IZ$+|L*?~sFr^izGm&# zi7gz{WG0;nx&F53?L?5awBnr8Uwa