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 <scarky0@onet.eu>

diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl
index c47f8ae962ac039d2b3556351d294926d96019c3..188ae2ee852d100825fea9b1b87c9b5697eb47fa 100644 (file)
--- 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 f4b7e2aca29daa49030db5adb9424e7619f3cc78..b38d954cc8d33f984d3e2be31e718506d997d9b5 100644 (file)
--- 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 fbaf3ae193228fbdbdbd9db0d61d80193a5c94e9..ccb852c5da70366575557610e7d60903ab434527 100644 (file)
--- 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 (file)
index 0000000..7f24544
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_l.png differ

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 (file)
index 0000000..9cb9407
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_vulpkanin_r.png differ

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 (file)
Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png and b/Resources/Textures/Mobs/Species/Vulpkanin/parts.rsi/eyes.png differ