From 2838a5f85e07b38fa040704cf93b22ebfe5c44ae Mon Sep 17 00:00:00 2001 From: Aikakakah <145503852+Aikakakah@users.noreply.github.com> Date: Wed, 30 Oct 2024 09:53:52 -0400 Subject: [PATCH] Scar and Tattoo Fixes (#1889) * Update tattoos.yml Fixes chest tattoos showing through clothes on females. Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Update scars.yml Fixes the chest scar showing through clothes on females. Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Add files via upload Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Delete Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Update meta.json Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Delete Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Add files via upload Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Update meta.json Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Update tattoos.ftl Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Update scars.ftl Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> * Commented changes to denote DeltaV * Edited scars and tattoo.ftl * Moved female variants to DeltaV namespace, fixed comments on others. --------- Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> --- .../Locale/en-US/deltav/markings/scars.ftl | 2 ++ .../Locale/en-US/deltav/markings/tattoos.ftl | 8 +++++ Resources/Locale/en-US/markings/tattoos.ftl | 2 +- .../Mobs/Customization/Markings/scars.yml | 10 ++++++ .../Mobs/Customization/Markings/tattoos.yml | 29 ++++++++++++++++++ .../Mobs/Customization/Markings/scars.yml | 2 ++ .../Mobs/Customization/Markings/tattoos.yml | 4 ++- .../Mobs/Customization/scars.rsi/meta.json | 16 ++++++++++ .../scars.rsi/scar_chest_female.png | Bin 0 -> 297 bytes .../Mobs/Customization/tattoos.rsi/meta.json | 23 ++++++++++++++ .../tattoos.rsi/tattoo_hive_chest_female.png | Bin 0 -> 224 bytes .../tattoos.rsi/tattoo_nightling.png | Bin 0 -> 250 bytes .../tattoos.rsi/tattoo_nightling_female.png | Bin 0 -> 248 bytes 13 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/scars.ftl create mode 100644 Resources/Locale/en-US/deltav/markings/tattoos.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png diff --git a/Resources/Locale/en-US/deltav/markings/scars.ftl b/Resources/Locale/en-US/deltav/markings/scars.ftl new file mode 100644 index 00000000000..151dcbf28b4 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/scars.ftl @@ -0,0 +1,2 @@ +marking-ScarChestFemale-scar_chest_female = Chest Scar +marking-ScarChestFemale = Chest Scar diff --git a/Resources/Locale/en-US/deltav/markings/tattoos.ftl b/Resources/Locale/en-US/deltav/markings/tattoos.ftl new file mode 100644 index 00000000000..d62a118a890 --- /dev/null +++ b/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) diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index a3d1d1ef686..84a53561878 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/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) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml new file mode 100644 index 00000000000..0b27c239baa --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml new file mode 100644 index 00000000000..e8174f74b48 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 13c09f99089..687fe1ca4c3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/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 + diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 345115bf5aa..1e284c813b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/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 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json new file mode 100644 index 00000000000..bcdb3ffbf2e --- /dev/null +++ b/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 + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png new file mode 100644 index 0000000000000000000000000000000000000000..b6009e3b66291fe84b37b4acb470c95f5a8bc862 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_7o??aZf;&vQL(e9XGeGU!iC8BCT3HFj8zhH*{V6e1) z*>9lGEKe85kcv6UDGCe{?xGV`Gz31doutvk9KJxOKy0By#Ju+mvzXKl*FP8JlF{S7 z=NNuqc>&|iq+|6NTr(sq>=*2KYd?#L{n+0hwTT}dGS;y&@yLJBO8C_tE47Z{o!XqR z2P})Z+(dg6SkJvb_c-*xr*_8&%yz5?vp+^3TvRW%pQ*k7`A6-90t*KR$3sj^Tr741 h0SxSmx!C%d7z&tW9kp+;g#um4;OXk;vd$@?2>?SPW%U36 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json new file mode 100644 index 00000000000..5693064c0f5 --- /dev/null +++ b/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 + } + ] + } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png new file mode 100644 index 0000000000000000000000000000000000000000..835ae506555f50169c927f54ab83b285639dc157 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#)oYbivBE?5h~uU71%ge2#x*T^rIc zjfs`77i6**{7P7r-SEj#XTkyd9bIj0j!&mMYBDe+HV8RJvbaP6En@I= L^>bP0l+XkKJM~9g literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png new file mode 100644 index 0000000000000000000000000000000000000000..ab92c759219f900fa022f2a375dee007d031e8ac GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#<|NsC0!Gi}ocI;rfA9VuAXDJEt3kHd9)^+Fr^2SSU-{AJc3-%irw9Oa)V^o-*IsbY228Qmlg3=Qh4!87)uSm0y`o4hc z#1@qWTm|mu97Pj;w?5fIhR}wu<~R4riY|zG(8x69@L$nMP5%xr mZ8UVgOMR;fwZGh(MOQ`89ZJ6T-G@yGywqjH&~DW literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png new file mode 100644 index 0000000000000000000000000000000000000000..06b4f37ae7d2e99cddf0a2f6acb0ffa5cc2482fd GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP>?6UC&U#<|NsC0!Gi}ocI;rfA9VuAXDJEt3kHd9)^+Fr@=HBk978JR zB&Rqq_cTW|T>SSU-{AJc3-%irw9Oa)V^o-*IsbY228Qmlg3=Qh4!87)uSm0y`o4hc z#1@qWTm|mu97Pj;w?5fIhR}wu<~R4riY|zG(8x69@L$nMP5%xr lZ8UV<-(qcW?UEw{!(vBC$J&$IOMnhw@O1TaS?83{1OQlfSl<8u literal 0 HcmV?d00001