From e0f9b06f9acfd0dd5e3e8ffef914212967fca432 Mon Sep 17 00:00:00 2001 From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com> Date: Tue, 8 Nov 2022 13:16:12 -0800 Subject: [PATCH] Heterochromia (#12126) * eye markings * downsizes * fixes reptilian.yml * hopefully fixes files changed stuffs * fix narcotics.yml --- Resources/Locale/en-US/markings/tattoos.ftl | 6 ++++++ .../Mobs/Customization/Markings/reptilian.yml | 2 +- .../Mobs/Customization/Markings/slime.yml | 2 +- .../Mobs/Customization/Markings/tattoos.yml | 18 ++++++++++++++++++ .../Mobs/Customization/tattoos.rsi/meta.json | 8 ++++++++ .../tattoos.rsi/tattoo_eye_l.png | Bin 0 -> 130 bytes .../tattoos.rsi/tattoo_eye_r.png | Bin 0 -> 129 bytes 7 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_l.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_r.png diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index b17d945775..12675f3d52 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -22,4 +22,10 @@ marking-TattooCampbellLeftLeg = Left Leg Tattoo (Campbelle) marking-TattooCampbellRightLeg-campbellrightleg = Right Leg Tattoo (Campbelle) marking-TattooCampbellRightLeg = Right Leg Tattoo (Campbelle) +marking-TattooEyeRight-eyeright = Right Eye +marking-TattooEyeRight = Right Eye + +marking-TattooEyeLeft-eyeleft = Left Eye +marking-TattooEyeLeft = Left Eye + diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 3de48139bf..8c24e82cea 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -181,4 +181,4 @@ speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi - state: body_tiger + state: body_tiger \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml index 8602d2d900..b827b0221c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml @@ -50,4 +50,4 @@ speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi - state: gradient_r_hand + state: gradient_r_hand \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index e8eaaf5d48..3b2991134b 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -69,3 +69,21 @@ sprites: - sprite: Mobs/Customization/tattoos.rsi state: tattoo_campbell_r_leg + +- type: marking + id: TattooEyeRight + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Human, SlimePerson, Reptilian] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_r + +- type: marking + id: TattooEyeLeft + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Human, SlimePerson, Reptilian] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_l diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json index 9a41a1b49e..38dfe7ea71 100644 --- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json @@ -38,6 +38,14 @@ { "name": "tattoo_silverburgh_l_leg", "directions": 4 + }, + { + "name": "tattoo_eye_r", + "directions": 4 + }, + { + "name": "tattoo_eye_l", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_l.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_l.png new file mode 100644 index 0000000000000000000000000000000000000000..add983626b93b983ae25b0567f77eb571ac87ae6 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP|(EF z#WAE}&f8m#ybKH+%!Yqv%gKFHR9xF6Twu%);63Rz$N&&{An(rvW;i4=7J0D$bk;W& P0`Wav{an^LB{Ts5@sk}1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_r.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_r.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2f4ca5632c2eeb3f8765ea11035437388cf682 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP|(=Z z#WAE}&f8mtj0_AMhYkMBmXoSzP!0@WT+7t3QDtWyPz@NA{bYqO=4CrfWB(bE;?)7- Nd%F6$taD0e0ssdp9?$>) literal 0 HcmV?d00001