From 7616b9aa1cd4be8c64b3bbe1c7f176aa27bc1fd9 Mon Sep 17 00:00:00 2001 From: Huaqas Date: Sun, 14 Sep 2025 23:18:48 +0800 Subject: [PATCH] Fix Heterochromia for Vulpkanin (#40320) * Add More Holy Books * Revert "Add More Holy Books" This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995. * Fix eyes * Add the undergarments and ftl designations. * Missed something. * second edited line didnt save for some reason * Im tired dont judge me * Fix eyes * Reverting stuff * fix markings * Its joever * Update meta.json * small tweak --------- Co-authored-by: ScarKy0 --- Resources/Locale/en-US/markings/tattoos.ftl | 6 ++++ .../Mobs/Customization/Markings/tattoos.yml | 32 ++++++++++++++++-- .../Mobs/Customization/tattoos.rsi/meta.json | 8 +++++ .../tattoos.rsi/tattoo_eye_vulpkanin_l.png | Bin 0 -> 146 bytes .../tattoos.rsi/tattoo_eye_vulpkanin_r.png | Bin 0 -> 148 bytes .../Mobs/Species/Vulpkanin/parts.rsi/eyes.png | Bin 143 -> 156 bytes 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_l.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_r.png diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index c47f8ae962..188ae2ee85 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -34,6 +34,12 @@ marking-TattooEyeMothRight = Right Eye marking-TattooEyeMothLeft-tattoo_eye_moth_l = Left Eye marking-TattooEyeMothLeft = Left Eye +marking-TattooEyeVulpkaninRight-tattoo_eye_vulpkanin_r = Right Eye +marking-TattooEyeVulpkaninRight = Right Eye + +marking-TattooEyeVulpkaninLeft-tattoo_eye_vulpkanin_l = Left Eye +marking-TattooEyeVulpkaninLeft = Left Eye + marking-TattooEyeVoxRight-tattoo_eye_vox_r = Right Eye marking-TattooEyeVoxRight = Right Eye diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index f4b7e2aca2..b38d954cc8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -114,7 +114,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: [Head] - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf] coloring: default: type: @@ -128,7 +128,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf] coloring: default: type: @@ -166,6 +166,34 @@ - sprite: Mobs/Customization/tattoos.rsi state: tattoo_eye_moth_l +- type: marking + id: TattooEyeVulpkaninRight + bodyPart: Eyes + markingCategory: [Head] + speciesRestriction: [Vulpkanin] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_vulpkanin_r + +- type: marking + id: TattooEyeVulpkaninLeft + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Vulpkanin] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_vulpkanin_l + - type: marking id: TattooEyeshadowUpper # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional. diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json index fbaf3ae193..ccb852c5da 100644 --- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json @@ -55,6 +55,14 @@ "name": "tattoo_eye_moth_l", "directions": 4 }, + { + "name": "tattoo_eye_vulpkanin_r", + "directions": 4 + }, + { + "name": "tattoo_eye_vulpkanin_l", + "directions": 4 + }, { "name": "eyeshadow_upper", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_l.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_l.png new file mode 100644 index 0000000000000000000000000000000000000000..7f24544eec7c95827ae8264c10a78acba55bd499 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP|(HG z#WAE}&f8mtTnq|4%nrYQ*+mx?>p2C!i<^)mX~f1bCH2{zT|jLRQ2)`Bfg!Ks9fRm| hwyugzOhC~K8H|~X0!li&=G_FT@pScbS?83{1OS70CH?>a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_r.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_r.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb9407d037cc3eda596b552cfdb6069d4bd33dc GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP|(fO z#WAE}&f8mxd<+Ua%nsjv*;X(3pb+8lE+qB2niU&^%t}?`)w|h&NFVdQ&MBb@03IhO>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png index a4f647ba15dfad5da7894c2d4befc7ddf9cd8446..963d350db24570459922e9ad0ccea21a97f47ad5 100644 GIT binary patch delta 106 zcmeBYoWnT5GTG15#WAE}&f8lXc@G$Hus9goCf{CIJo^M^SIKpUpCuypYz%jd^k-UT zuaDei%*X%%?{EEPiof8=z~I;Mj=}$peZUcYe~^rn?lNUrr|QI)8$diyS3j3^P6