Slime Nubody tweaks and new markings (incl. ports from Impstation) (#6288)

* Slime people tweaks and new markings (incl. ports from Impstation)
-Removed eyes, mouth, nose, and torso bitties from base Slime person sprite
   -Added them back in as optional markings (excl. mouth as Delta-V has lips already)
-Added the new "OrganSlimeEyes" to Slime people to handle eye markings
-Ported Cyclops and Droopy eyes from Impstation
   -Assigned Droopy eyes as "Droopy Eyes (Left)"
   -Made corresponding Droopy eyes on the right side
   -Added "Four eyes" marking
-Removed eyeshadow tattoo markings from Slime people
   -Added a copy into _DV's makeup directory assigned purely to Slime people
   -Made new matching eyeshadows for the various new eye types
-Adjusted the marking limits to make sense with the tweaks
-Moved and reorganized the Slime Elf Ears within the _DV directories to make more sense

* Fixed Slime people full.png sprite dimensions

* -Removed "followSkinColor" from Prototypes\_Impstation\Entities\Mobs\Customization\Markings\slime.yml causing an error

* Update Resources/Prototypes/Body/Species/slime.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>

* Update Resources/Prototypes/Body/Species/slime.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>

* - Fixed formatting and improved in line comment readability.
- Moved eyeshadow additions from makeup to Slime categories
- Added "matchskin" to relevant body markings that are meant to follow skin color

* -Returned Eyeshadow to eye markings category
-Returned Slime to whitelisted group in tattoos.yml
-Removed Eye markings limit and the requirement to have eyes
-Added two new eyes to complement the r/l eyes for more eye mixing
-Tweaked inline readability and organization

* Removed outdated prototype MatchSkin from slime.yml

---------

Signed-off-by: ollyo <296974732+ollyoaner@users.noreply.github.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>

Resources/Locale/en-US/_DV/markings/slime_ears.ftl

@@ -1,6 +0,0 @@
-marking-SlimeLongEars = Long Ears Standard
-marking-SlimeEarsWide = Long Ears Wide
-marking-SlimeEarsSmall = Long Ears Small
-marking-SlimeEarsUpwards = Long Ears Upwards
-marking-SlimeEarsTall = Long Ears Tall
-marking-SlimeEarsThin = Long Ears Thin

Resources/Locale/en-US/_DV/markings/slimeperson.ftl

@@ -0,0 +1,54 @@
+# Ears
+marking-SlimeLongEars = Long Ears Standard
+marking-SlimeLongEars-slime_ears_standard = Long Ears Standard
+
+marking-SlimeEarsWide = Long Ears Wide
+marking-SlimeEarsWide-slime_ears_wide = Long Ears Wide
+
+marking-SlimeEarsSmall = Long Ears Small
+marking-SlimeEarsSmall-slime_ears_small = Long Ears Small
+
+marking-SlimeEarsUpwards = Long Ears Upwards
+marking-SlimeEarsUpwards-slime_ears_upwards = Long Ears Upwards
+
+marking-SlimeEarsTall = Long Ears Tall
+marking-SlimeEarsTall-slime_ears_tall = Long Ears Tall
+
+marking-SlimeEarsThin = Long Ears Thin
+marking-SlimeEarsThin-slime_ears_thin = Long Ears Thin
+
+# Eyes
+marking-SlimeEyesDroopyRight = Droopy Eyes (Right)
+marking-SlimeEyesDroopyRight-droopyR = Droopy Eyes (Right)
+
+marking-SlimeEyesFourEyes = 4 Eyes
+marking-SlimeEyesFourEyes-foureyes = 4 Eyes
+
+marking-SlimeEyesLEyeLower = Left Eye (Lower)
+marking-SlimeEyesLEyeLower-lefteye_lower = Left Eye (Lower)
+
+marking-SlimeEyesREyeLower = Right Eye (Lower)
+marking-SlimeEyesREyeLower-righteye_lower = Right Eye (Lower)
+
+# Makeup
+marking-MakeupFoureyesEyeshadow-foureyes_eyeshadow = Eyeshadow Foureyes
+marking-MakeupFoureyesEyeshadow = Eyeshadow Foureyes
+
+marking-MakeupDroopyLEyeshadowUpper = Eyeshadow Droopy Upper (Left)
+marking-MakeupDroopyLEyeshadowUpper-droopyL_eyeshadow_upper = Eyeshadow Droopy Upper (Left)
+
+marking-MakeupDroopyLEyeshadowLower = Eyeshadow Droopy Lower (Left)
+marking-MakeupDroopyLEyeshadowLower-droopyL_eyeshadow_lower = Eyeshadow Droopy Lower (Left)
+
+marking-MakeupDroopyREyeshadowUpper = Eyeshadow Droopy Upper (Right)
+marking-MakeupDroopyREyeshadowUpper-droopyR_eyeshadow_upper = Eyeshadow Droopy Upper (Right)
+
+marking-MakeupDroopyREyeshadowLower = Eyeshadow Droopy Lower (Right)
+marking-MakeupDroopyREyeshadowLower-droopyR_eyeshadow_lower = Eyeshadow Droopy Lower (Right)
+
+# Chest
+marking-TorsoBitsF = Torso Bits
+marking-TorsoBitsF-torsobits_f = Torso Bits
+
+marking-TorsoBitsM = Torso Bits
+marking-TorsoBitsM-torsobits_m = Torso Bits

Resources/Locale/en-US/_Impstation/markings/slimeperson.ftl

@@ -0,0 +1,11 @@
+marking-SlimeEyesDefault = Eyes (Default)
+marking-SlimeEyesDefault-default = Eyes (Default)
+
+marking-SlimeEyesDroopyLeft = Droopy Eyes (Left)
+marking-SlimeEyesDroopyLeft-droopyL = Droopy Eyes (Left)
+
+marking-SlimeEyesCyclops = Cyclops Eye
+marking-SlimeEyesCyclops-cyclops = Cyclops Eye
+
+marking-SlimeNose = Nose (Profile)
+marking-SlimeNose-nose = Nose (Profile)

Resources/Prototypes/Body/Species/slime.yml

@@ -8,11 +8,14 @@
     enum.HumanoidVisualLayers.FacialHair:
       limit: 1
       required: false
-    enum.HumanoidVisualLayers.HeadSide: #Delta V - Adds marking limit to slime elf ears
+    enum.HumanoidVisualLayers.HeadSide: # DeltaV - Adds marking limit to slime elf ears
       limit: 1
       required: false
-    enum.HumanoidVisualLayers.Chest:
-      limit: 2
+    enum.HumanoidVisualLayers.Snout: # Impstation - Allows adding/removing nose
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.Chest: # DeltaV - Upped limit from 2 to 3 for seperated torso bits
+      limit: 3
       required: false
     enum.HumanoidVisualLayers.LArm:
       limit: 1
@@ -62,7 +65,7 @@
     organs:
       Torso: OrganSlimePersonTorso
       Head: OrganSlimePersonHead
-      Eyes: OrganHumanEyes # Delta V - Allows Coloring Slime Eyes.
+      Eyes: OrganSlimePersonEyes # DeltaV - Made custom Slime eye organ
       ArmLeft: OrganSlimePersonArmLeft
       ArmRight: OrganSlimePersonArmRight
       HandRight: OrganSlimePersonHandRight
@@ -275,3 +278,15 @@
   components:
   - type: Lung
     alert: LowNitrogen
+
+- type: entity  # DeltaV - Added custom Slime eye organ
+  parent: [ OrganSlimePersonExternal, OrganBaseEyes, OrganSlimePersonInternal ]
+  id: OrganSlimePersonEyes
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+  - type: VisualOrgan
+    layer: enum.HumanoidVisualLayers.Eyes
+    data:
+      sprite: Mobs/Customization/eyes.rsi  # DeltaV - Set to no eyes to prevent eye stacking
+      state: no_eyes

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/slime.yml

@@ -0,0 +1,174 @@
+# HeadSide - Ears
+- type: marking
+  id: SlimeLongEars
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_standard
+
+- type: marking
+  id: SlimeEarsWide
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_wide
+
+- type: marking
+  id: SlimeEarsSmall
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_small
+
+- type: marking
+  id: SlimeEarsUpwards
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_upwards
+
+- type: marking
+  id: SlimeEarsTall
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_tall
+
+- type: marking
+  id: SlimeEarsThin
+  bodyPart: HeadSide
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/ears.rsi
+    state: slime_ears_thin
+
+# Eyes
+- type: marking
+  id: SlimeEyesDroopyRight
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/eyes.rsi
+    state: droopyR
+
+- type: marking
+  id: SlimeEyesFourEyes
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/eyes.rsi
+    state: foureyes
+
+- type: marking
+  id: SlimeEyesLEyeLower
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/eyes.rsi
+    state: lefteye_lower
+
+- type: marking
+  id: SlimeEyesREyeLower
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/eyes.rsi
+    state: righteye_lower
+
+# Eyes - Makeup
+- type: marking
+  id: MakeupFoureyesEyeshadow
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/makeup.rsi
+    state: foureyes_eyeshadow
+
+- type: marking
+  id: MakeupDroopyLEyeshadowUpper
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/makeup.rsi
+    state: droopyL_eyeshadow_upper
+
+- type: marking
+  id: MakeupDroopyLEyeshadowLower
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/makeup.rsi
+    state: droopyL_eyeshadow_lower
+
+- type: marking
+  id: MakeupDroopyREyeshadowUpper
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/makeup.rsi
+    state: droopyR_eyeshadow_upper
+
+- type: marking
+  id: MakeupDroopyREyeshadowLower
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/makeup.rsi
+    state: droopyR_eyeshadow_lower
+
+# Chest
+- type: marking
+  id: TorsoBitsF
+  bodyPart: Chest
+  groupWhitelist: [Slime]
+  sexRestriction: [Female]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/chest.rsi
+    state: torsobits_f
+
+- type: marking
+  id: TorsoBitsM
+  bodyPart: Chest
+  groupWhitelist: [Slime]
+  sexRestriction: [Male]
+  forcedColoring: true
+  sprites:
+  - sprite: _DV/Mobs/Customization/Slime/chest.rsi
+    state: torsobits_m

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/slime_ears.yml

@@ -1,53 +0,0 @@
-- type: marking
-  id: SlimeLongEars
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_standard
-
-- type: marking
-  id: SlimeEarsWide
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_wide
-
-- type: marking
-  id: SlimeEarsSmall
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_small
-
-- type: marking
-  id: SlimeEarsUpwards
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_upwards
-
-- type: marking
-  id: SlimeEarsTall
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_tall
-
-- type: marking
-  id: SlimeEarsThin
-  bodyPart: HeadSide
-  forcedColoring: true
-  groupWhitelist: [Slime]
-  sprites:
-  - sprite: _DV/Mobs/Customization/slime_ears.rsi
-    state: slime_ears_thin

Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml

@@ -0,0 +1,49 @@
+# Eyes
+- type: marking
+  id: SlimeEyesDefault
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _Impstation/Mobs/Customization/Slime/eyes.rsi
+    state: default
+
+- type: marking
+  id: SlimeEyesCyclops
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _Impstation/Mobs/Customization/Slime/eyes.rsi
+    state: cyclops
+
+- type: marking
+  id: SlimeEyesDroopyLeft
+  bodyPart: Eyes
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _Impstation/Mobs/Customization/Slime/eyes.rsi
+    state: droopyL
+
+# Snout
+- type: marking
+  id: SlimeNose
+  bodyPart: Snout
+  groupWhitelist: [Slime]
+  forcedColoring: true
+  sprites:
+  - sprite: _Impstation/Mobs/Customization/Slime/snout.rsi
+    state: nose

Resources/Textures/_DV/Mobs/Customization/Slime/chest.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by ollyoaner (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "torsobits_f",
+            "directions": 4
+        },
+        {
+            "name": "torsobits_m",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Mobs/Customization/Slime/eyes.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by ollyoaner (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "droopyR",
+            "directions": 4
+        },
+        {
+            "name": "foureyes",
+            "directions": 4
+        },
+        {
+            "name": "lefteye_lower",
+            "directions": 4
+        },
+        {
+            "name": "righteye_lower",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Mobs/Customization/Slime/makeup.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "slime people specialty eyeshadow sprited by ollyoaner (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "foureyes_eyeshadow",
+            "directions": 4
+        },
+        {
+            "name": "droopyL_eyeshadow_lower",
+            "directions": 4
+        },
+        {
+            "name": "droopyR_eyeshadow_lower",
+            "directions": 4
+        },
+        {
+            "name": "droopyL_eyeshadow_upper",
+            "directions": 4
+        },
+        {
+            "name": "droopyR_eyeshadow_upper",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_Impstation/Mobs/Customization/Slime/eyes.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprited by Sha-Seng (Github), edits by ollyoaner (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cyclops",
+            "directions": 4
+        },
+        {
+            "name": "default",
+            "directions": 4
+        },
+        {
+            "name": "droopyL",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_Impstation/Mobs/Customization/Slime/snout.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprited by Sha-Seng (Github), edits by ollyoaner (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "nose",
+            "directions": 4
+        }
+    ]
+}