[Feature] Added More Slime People Markings (#345)

* Added Slime analogue of cat ears for slimepeople (#795) # Conflicts: # Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl # Resources/Prototypes/Corvax/slime_cat_parts.yml # Resources/Prototypes/Corvax/slime_fox_parts.yml # Resources/Prototypes/Species/slime.yml * feat: added elf ears to slime people Signed-off-by: Remuchi <[email protected]> * fix: move directories to lp folders Signed-off-by: Remuchi <[email protected]> * fix: marking limits for elf ears Signed-off-by: Remuchi <[email protected]> * fix: fixed your goddamn rsi validator Signed-off-by: Remuchi <[email protected]> * fix: and another one Signed-off-by: Remuchi <[email protected]> * fix: spare me * fix: you've deleted it. great * fix --------- Signed-off-by: Remuchi <[email protected]> Co-authored-by: mhamster <[email protected]> Co-authored-by: BL02DL <[email protected]>
Lost-Paradise-Project · Dec 22, 2024 · 7294b7e · 7294b7e
1 parent 744f4f2
commit 7294b7e
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 13 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
@@ -3,7 +3,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_standard
@@ -13,7 +13,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_wide
@@ -23,7 +23,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_small
@@ -33,7 +33,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_upwards
@@ -43,7 +43,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_tall
@@ -63,7 +63,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Human, Oni]
+  speciesRestriction: [Human, Oni, SlimePerson]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_thin

diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
@@ -22,6 +22,9 @@
     Hair: MobSlimeMarkingFollowSkin
     FacialHair: MobSlimeMarkingFollowSkin
     Chest: MobSlimeTorso
+    HeadTop: MobHumanoidAnyMarking # Lost Paradise Sponsors
+    HeadSide: MobHumanoidAnyMarking # Lost Paradise Elf Ears
+    Tail: MobHumanoidAnyMarking # Lost Paradise Sponsors
     Eyes: MobHumanoidEyes
     LArm: MobSlimeLArm
     RArm: MobSlimeRArm
@@ -41,6 +44,15 @@
     FacialHair:
       points: 1
       required: false
+    Tail:
+      points: 1 # Lost Paradise Sponsors
+      required: false
+    HeadTop:
+      points: 1 # Lost Paradise Sponsors
+      required: false
+    HeadSide:
+      points: 1 # Lost Paradise Elf Ears
+      required: false
     Chest:
       points: 1
       required: false

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_cat_parts.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_cat_parts.yml
@@ -0,0 +1,69 @@
+- type: marking
+  id: SlimeCatEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_cat_outer
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_cat_inner
+
+- type: marking
+  id: SlimeCatTail
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: slime_tail_cat_wag # Lost Paradise Sponsors
+
+- type: marking
+  id: SlimeCatEarsStubby
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_stubby_outer
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_stubby_inner
+
+- type: marking
+  id: SlimeCatEarsCurled
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_curled_outer
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_curled_inner
+
+- type: marking
+  id: SlimeCatEarsTorn
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_torn_outer
+  - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+    state: ears_slime_torn_inner
+
+- type: marking
+  id: SlimeCatTailStripes
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+    - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+      state: slime_tail_cat_wag_stripes_prime
+    - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
+      state: slime_tail_cat_wag_stripes_second
diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_fox_parts.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_fox_parts.yml
@@ -0,0 +1,11 @@
+- type: marking
+  id: SlimeFoxEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [SlimePerson]
+  sponsorOnly: true # Lost Paradise Sponsors
+  sprites:
+  - sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi
+    state: ears_slime_fox_outer
+  - sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi
+    state: ears_slime_fox_inner
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
@@ -21,11 +21,6 @@
       "name": "equipped-HELMET-vulpkanin",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-tajaran",
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "equipped-HELMET-tajaran",
       "directions": 4
@@ -40,15 +35,18 @@
     },
     {
       "name": "inhand-left",
-      "name": "on-equipped-HELMET-vox",
       "directions": 4
     },
     {
       "name": "inhand-right",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]

diff --git a/...me_cat_parts.rsi/ears_slime_cat_inner.png → ...me_cat_parts.rsi/ears_slime_cat_inner.png b/...me_cat_parts.rsi/ears_slime_cat_inner.png → ...me_cat_parts.rsi/ears_slime_cat_inner.png
diff --git a/...me_cat_parts.rsi/ears_slime_cat_outer.png → ...me_cat_parts.rsi/ears_slime_cat_outer.png b/...me_cat_parts.rsi/ears_slime_cat_outer.png → ...me_cat_parts.rsi/ears_slime_cat_outer.png
diff --git a/...cat_parts.rsi/ears_slime_curled_inner.png → ...cat_parts.rsi/ears_slime_curled_inner.png b/...cat_parts.rsi/ears_slime_curled_inner.png → ...cat_parts.rsi/ears_slime_curled_inner.png
diff --git a/...cat_parts.rsi/ears_slime_curled_outer.png → ...cat_parts.rsi/ears_slime_curled_outer.png b/...cat_parts.rsi/ears_slime_curled_outer.png → ...cat_parts.rsi/ears_slime_curled_outer.png
diff --git a/...cat_parts.rsi/ears_slime_stubby_inner.png → ...cat_parts.rsi/ears_slime_stubby_inner.png b/...cat_parts.rsi/ears_slime_stubby_inner.png → ...cat_parts.rsi/ears_slime_stubby_inner.png
diff --git a/...cat_parts.rsi/ears_slime_stubby_outer.png → ...cat_parts.rsi/ears_slime_stubby_outer.png b/...cat_parts.rsi/ears_slime_stubby_outer.png → ...cat_parts.rsi/ears_slime_stubby_outer.png
diff --git a/...e_cat_parts.rsi/ears_slime_torn_inner.png → ...e_cat_parts.rsi/ears_slime_torn_inner.png b/...e_cat_parts.rsi/ears_slime_torn_inner.png → ...e_cat_parts.rsi/ears_slime_torn_inner.png
diff --git a/...e_cat_parts.rsi/ears_slime_torn_outer.png → ...e_cat_parts.rsi/ears_slime_torn_outer.png b/...e_cat_parts.rsi/ears_slime_torn_outer.png → ...e_cat_parts.rsi/ears_slime_torn_outer.png
diff --git a/...stomization/slime_cat_parts.rsi/meta.json → ...stomization/slime_cat_parts.rsi/meta.json b/...stomization/slime_cat_parts.rsi/meta.json → ...stomization/slime_cat_parts.rsi/meta.json
diff --git a/...on/slime_cat_parts.rsi/slime_tail_cat.png → ...on/slime_cat_parts.rsi/slime_tail_cat.png b/...on/slime_cat_parts.rsi/slime_tail_cat.png → ...on/slime_cat_parts.rsi/slime_tail_cat.png
diff --git a/...lime_cat_parts.rsi/slime_tail_cat_wag.png → ...lime_cat_parts.rsi/slime_tail_cat_wag.png b/...lime_cat_parts.rsi/slime_tail_cat_wag.png → ...lime_cat_parts.rsi/slime_tail_cat_wag.png
diff --git a/....rsi/slime_tail_cat_wag_stripes_prime.png → ....rsi/slime_tail_cat_wag_stripes_prime.png b/....rsi/slime_tail_cat_wag_stripes_prime.png → ....rsi/slime_tail_cat_wag_stripes_prime.png
diff --git a/...rsi/slime_tail_cat_wag_stripes_second.png → ...rsi/slime_tail_cat_wag_stripes_second.png b/...rsi/slime_tail_cat_wag_stripes_second.png → ...rsi/slime_tail_cat_wag_stripes_second.png
diff --git a/...me_fox_parts.rsi/ears_slime_fox_inner.png → ...me_fox_parts.rsi/ears_slime_fox_inner.png b/...me_fox_parts.rsi/ears_slime_fox_inner.png → ...me_fox_parts.rsi/ears_slime_fox_inner.png
diff --git a/...me_fox_parts.rsi/ears_slime_fox_outer.png → ...me_fox_parts.rsi/ears_slime_fox_outer.png b/...me_fox_parts.rsi/ears_slime_fox_outer.png → ...me_fox_parts.rsi/ears_slime_fox_outer.png
diff --git a/...stomization/slime_fox_parts.rsi/meta.json → ...stomization/slime_fox_parts.rsi/meta.json b/...stomization/slime_fox_parts.rsi/meta.json → ...stomization/slime_fox_parts.rsi/meta.json