From 55540c374a97602f062bed364955a96bc8ed36df Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Wed, 11 Jun 2025 23:56:57 +0200 Subject: [PATCH] scar availability for more species (#35645) * :D * updated for new scars * small eye scar --- Resources/Locale/en-US/markings/scars.ftl | 8 +++- .../Mobs/Customization/Markings/scars.yml | 42 +++++++++++++----- .../Mobs/Customization/scars.rsi/meta.json | 10 ++++- .../scars.rsi/scar_eye_left_small.png | Bin 0 -> 459 bytes .../scars.rsi/scar_eye_right_small.png | Bin 0 -> 458 bytes 5 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png create mode 100644 Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl index f31f054911..75eedf0cd2 100644 --- a/Resources/Locale/en-US/markings/scars.ftl +++ b/Resources/Locale/en-US/markings/scars.ftl @@ -26,4 +26,10 @@ 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 +marking-ScarFace2 = Face Scar (Small) + +marking-ScarEyeRightSmall-scar_eye_right_small = Right Eye Scar (Small) +marking-ScarEyeRightSmall = Small Eye Scar (Right) + +marking-ScarEyeLeftSmall-scar_eye_left_small = Left Eye Scar (Small) +marking-ScarEyeLeftSmall = Small Eye Scar (Left) \ 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 4de3b59182..5dd1cd560e 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, SlimePerson] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, SlimePerson] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona] sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona] sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -54,7 +54,7 @@ id: ScarNeck bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -64,7 +64,7 @@ id: ScarChestBullets bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -74,7 +74,7 @@ id: ScarStomachBullets bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -84,7 +84,7 @@ id: ScarFace1 bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -94,8 +94,28 @@ id: ScarFace2 bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi - state: scar_face_2 \ No newline at end of file + state: scar_face_2 + +- type: marking + id: ScarEyeRightSmall + bodyPart: Head + markingCategory: Head + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_eye_right_small + +- type: marking + id: ScarEyeLeftSmall + bodyPart: Head + markingCategory: Head + speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/scars.rsi + state: scar_eye_left_small diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json index 9bc0d3263e..4794e3270a 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": "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)", + "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), scar_eye_left_small and scar_eye_right_small modified from scar_eye_left and scar_eye_right by Boaz1111(github).", "size": { "x": 32, "y": 32 @@ -46,6 +46,14 @@ { "name": "scar_face_2", "directions": 4 + }, + { + "name": "scar_eye_left_small", + "directions": 4 + }, + { + "name": "scar_eye_right_small", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left_small.png new file mode 100644 index 0000000000000000000000000000000000000000..3188e28efcf01e4d1021740bb0f23be0b6b26aa3 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zUfI%rXlC7oEj@c@)&RxC=hzkkDb|u8zu^Bs!0>w;UocRBv%n*= zn1O-sFbFdq&tH)O6qG1&jVKAuPb(=;EJ|evNX*PD(erZ+Q83jr)U%Mze6<3oW?O26 zXPT#{76S*!SOzIZRt82O%L|C5p=^-LH5i$};!HrcAtMum0FaIX;>>myuy_`b4FU;3 z4AKvy(JW;E`h5aB0}D`vfswHR;{u4OARVj=ASO)#vO$0eXbuxtWss!>kOkFcXkY-6 zUEQE496ZlL1IYCAba4!caDRKjnu|e!hb7Q{=l_|himk1!ib@^EzPpZ3N;=6P<`81D zf5ET2Z~ru9Ffed2I50A-c;E1>{MDzXcjd3Ps_QW^1OUYqcxUi#ak2kyB^6l*vc=QY K&t;ucLK6U)WN3c? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right_small.png new file mode 100644 index 0000000000000000000000000000000000000000..46f241b004bef69e2f9c8fb23824877a0ec278f3 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zUfpgBxnl|hykKo(S&p@9KN zc6EcIaPT|}4ItCk)5S3)!u{<9Yc2)@4wj2Gd;ZTn+!QNyl*MUA<{P>0vt5ii4)?70 zF8JMBUgc;9^5p^shAZ