From 9d29de0c0d3963c95d1b496d94af4f67e3a5e6ce Mon Sep 17 00:00:00 2001 From: mhamster <81412348+mhamsterr@users.noreply.github.com> Date: Thu, 2 Feb 2023 03:15:00 +0700 Subject: [PATCH 1/9] 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 --- .../Prototypes/Corvax/slime_cat_parts.yml | 69 +++++++++++++++++++ .../Prototypes/Corvax/slime_fox_parts.yml | 11 +++ Resources/Prototypes/Species/slime.yml | 8 +++ 3 files changed, 88 insertions(+) create mode 100644 Resources/Prototypes/Corvax/slime_cat_parts.yml create mode 100644 Resources/Prototypes/Corvax/slime_fox_parts.yml diff --git a/Resources/Prototypes/Corvax/slime_cat_parts.yml b/Resources/Prototypes/Corvax/slime_cat_parts.yml new file mode 100644 index 0000000000..25bdbb744e --- /dev/null +++ b/Resources/Prototypes/Corvax/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: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: ears_slime_cat_outer + - sprite: Corvax/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: Corvax/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: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: ears_slime_stubby_outer + - sprite: Corvax/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: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: ears_slime_curled_outer + - sprite: Corvax/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: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: ears_slime_torn_outer + - sprite: Corvax/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: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: slime_tail_cat_wag_stripes_prime + - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + state: slime_tail_cat_wag_stripes_second diff --git a/Resources/Prototypes/Corvax/slime_fox_parts.yml b/Resources/Prototypes/Corvax/slime_fox_parts.yml new file mode 100644 index 0000000000..db856edc69 --- /dev/null +++ b/Resources/Prototypes/Corvax/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: Corvax/Mobs/Customization/slime_fox_parts.rsi + state: ears_slime_fox_outer + - sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi + state: ears_slime_fox_inner diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index a01b50b929..856dd54aa1 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -22,6 +22,8 @@ Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso + HeadTop: MobHumanoidAnyMarking # Lost Paradise Sponsors + Tail: MobHumanoidAnyMarking # Lost Paradise Sponsors Eyes: MobHumanoidEyes LArm: MobSlimeLArm RArm: MobSlimeRArm @@ -41,6 +43,12 @@ FacialHair: points: 1 required: false + Tail: + points: 1 # Lost Paradise Sponsors + required: false + HeadTop: + points: 1 # Lost Paradise Sponsors + required: false Chest: points: 1 required: false From 76fc6923e594d3c7ef35a16bbc2e008433e4a86b Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 19 Dec 2024 16:35:16 +0700 Subject: [PATCH 2/9] feat: added elf ears to slime people Signed-off-by: Remuchi --- .../Mobs/Customization/Markings/pointy_ears.yml | 12 ++++++------ Resources/Prototypes/Species/slime.yml | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index eaca2c0e6d..ba3f38d720 100644 --- 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 index 856dd54aa1..6a51432489 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -23,6 +23,7 @@ FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso HeadTop: MobHumanoidAnyMarking # Lost Paradise Sponsors + HeadSide: MobHumanoidAnyMarking # Lost Paradise Elf Ears Tail: MobHumanoidAnyMarking # Lost Paradise Sponsors Eyes: MobHumanoidEyes LArm: MobSlimeLArm From 496ad9cd6042a80df816dfa9d39328e6353555c7 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 19 Dec 2024 16:48:12 +0700 Subject: [PATCH 3/9] fix: move directories to lp folders Signed-off-by: Remuchi --- .../Mobs/Customization}/slime_cat_parts.yml | 22 +++++++++--------- .../Mobs/Customization}/slime_fox_parts.yml | 4 ++-- .../ears_slime_cat_inner.png | Bin .../ears_slime_cat_outer.png | Bin .../ears_slime_curled_inner.png | Bin .../ears_slime_curled_outer.png | Bin .../ears_slime_stubby_inner.png | Bin .../ears_slime_stubby_outer.png | Bin .../ears_slime_torn_inner.png | Bin .../ears_slime_torn_outer.png | Bin .../slime_cat_parts.rsi/meta.json | 0 .../slime_cat_parts.rsi/slime_tail_cat.png | Bin .../slime_tail_cat_wag.png | Bin .../slime_tail_cat_wag_stripes_prime.png | Bin .../slime_tail_cat_wag_stripes_second.png | Bin .../ears_slime_fox_inner.png | Bin .../ears_slime_fox_outer.png | Bin .../slime_fox_parts.rsi/meta.json | 0 18 files changed, 13 insertions(+), 13 deletions(-) rename Resources/Prototypes/{Corvax => _LostParadise/Entities/Mobs/Customization}/slime_cat_parts.yml (67%) rename Resources/Prototypes/{Corvax => _LostParadise/Entities/Mobs/Customization}/slime_fox_parts.yml (64%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/meta.json (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.png (100%) rename Resources/Textures/{Corvax => _LostParadise}/Mobs/Customization/slime_fox_parts.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Corvax/slime_cat_parts.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_cat_parts.yml similarity index 67% rename from Resources/Prototypes/Corvax/slime_cat_parts.yml rename to Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_cat_parts.yml index 25bdbb744e..4c391eb9f4 100644 --- a/Resources/Prototypes/Corvax/slime_cat_parts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_cat_parts.yml @@ -5,9 +5,9 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_cat_outer - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_cat_inner - type: marking @@ -17,7 +17,7 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: slime_tail_cat_wag # Lost Paradise Sponsors - type: marking @@ -27,9 +27,9 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_stubby_outer - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_stubby_inner - type: marking @@ -39,9 +39,9 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_curled_outer - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_curled_inner - type: marking @@ -51,9 +51,9 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_torn_outer - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_torn_inner - type: marking @@ -63,7 +63,7 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: slime_tail_cat_wag_stripes_prime - - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi state: slime_tail_cat_wag_stripes_second diff --git a/Resources/Prototypes/Corvax/slime_fox_parts.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_fox_parts.yml similarity index 64% rename from Resources/Prototypes/Corvax/slime_fox_parts.yml rename to Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_fox_parts.yml index db856edc69..390956fc76 100644 --- a/Resources/Prototypes/Corvax/slime_fox_parts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/slime_fox_parts.yml @@ -5,7 +5,7 @@ speciesRestriction: [SlimePerson] sponsorOnly: true # Lost Paradise Sponsors sprites: - - sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi state: ears_slime_fox_outer - - sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi + - sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi state: ears_slime_fox_inner diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/meta.json similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/meta.json rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/meta.json diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.png b/Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.png similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.png rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.png diff --git a/Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/meta.json similarity index 100% rename from Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/meta.json rename to Resources/Textures/_LostParadise/Mobs/Customization/slime_fox_parts.rsi/meta.json From 8ff6d82bfaa4e4722c55927d16db94bc0a98747b Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 19 Dec 2024 16:53:45 +0700 Subject: [PATCH 4/9] fix: marking limits for elf ears Signed-off-by: Remuchi --- Resources/Prototypes/Species/slime.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index 6a51432489..5d22c8bda0 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -50,6 +50,9 @@ HeadTop: points: 1 # Lost Paradise Sponsors required: false + HeadSide: + points: 1 # Lost Paradise Elf Ears + required: false Chest: points: 1 required: false From 0e52e421d2098cdfc50ad34edbfbb1ae3a9af9a8 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 19 Dec 2024 17:08:55 +0700 Subject: [PATCH 5/9] fix: fixed your goddamn rsi validator Signed-off-by: Remuchi --- .../Clothing/Head/Hardsuits/capspace.rsi/meta.json | 10 ++++++++-- .../Clothing/Head/Hardsuits/deathsquad.rsi/meta.json | 4 ++++ .../Textures/Clothing/Mask/gassecurity.rsi/meta.json | 8 ++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index 792179b13e..6e0435005c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -23,7 +23,6 @@ }, { "name": "equipped-HELMET-tajaran", - "name": "off-equipped-HELMET-vox", "directions": 4 }, { @@ -36,12 +35,19 @@ }, { "name": "inhand-left", - "name": "on-equipped-HELMET-vox", "directions": 4 }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index e1055dc3d7..f7f6067b16 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -29,6 +29,10 @@ "name": "on-inhand-left", "directions": 4 }, + { + "name": "on-inhand-right", + "directions": 4 + }, { "name": "off-inhand-right", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 640e64c1e0..6ffdec8a18 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -45,6 +45,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vox", + "directions": 4 } ] } From d9bdee105ab9d6b80360d5f1cff284d1c4a9efa1 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 19 Dec 2024 17:11:57 +0700 Subject: [PATCH 6/9] fix: and another one Signed-off-by: Remuchi --- Resources/Textures/Clothing/Mask/medical.rsi/meta.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 00965dff4d..5e96e09274 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "equipped-MASK-vulpkanin", "directions": 4 From c795f0a59b466ea97af7910321f94964c96c10d7 Mon Sep 17 00:00:00 2001 From: Remuchi <72476615+Remuchi@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:20:43 +0700 Subject: [PATCH 7/9] fix: spare me --- Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 6ffdec8a18..cf48caaef2 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -46,10 +46,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "up-equipped-MASK", - "directions": 4 - }, { "name": "up-equipped-MASK-vox", "directions": 4 From 4db96456c11d5c0d3a068809975df65dc951e1bd Mon Sep 17 00:00:00 2001 From: Remuchi <72476615+Remuchi@users.noreply.github.com> Date: Sun, 22 Dec 2024 12:07:17 +0700 Subject: [PATCH 8/9] fix: you've deleted it. great --- Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index cf48caaef2..640e64c1e0 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -45,10 +45,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "up-equipped-MASK-vox", - "directions": 4 } ] } From 0c9008ecb98ed8d6be0b0909af459e750ff3e6c0 Mon Sep 17 00:00:00 2001 From: Remuchi <72476615+Remuchi@users.noreply.github.com> Date: Sun, 22 Dec 2024 12:23:47 +0700 Subject: [PATCH 9/9] fix --- .../Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index a3429da14e..6e0435005c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -25,10 +25,6 @@ "name": "equipped-HELMET-tajaran", "directions": 4 }, - { - "name": "equipped-HELMET-tajaran", - "directions": 4 - }, { "name": "equipped-HELMET-shark", "directions": 4