From 5bce7a4619cf5a38a60389290090b728a7664a8e Mon Sep 17 00:00:00 2001 From: No Elka Date: Sun, 17 Nov 2024 09:50:20 +0300 Subject: [PATCH 1/4] Change stuff --- Resources/Locale/ru-RU/markings/horns.ftl | 4 ++ .../Mobs/Customization/Markings/horns.yml | 43 ++++++++++++++++++ Resources/Prototypes/Species/slime.yml | 4 ++ .../Customization/horns.rsi/horns_short.png | Bin 0 -> 182 bytes .../Customization/horns.rsi/horns_simple.png | Bin 0 -> 198 bytes .../Mobs/Customization/horns.rsi/meta.json | 20 ++++++++ 6 files changed, 71 insertions(+) create mode 100644 Resources/Locale/ru-RU/markings/horns.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml create mode 100644 Resources/Textures/Mobs/Customization/horns.rsi/horns_short.png create mode 100644 Resources/Textures/Mobs/Customization/horns.rsi/horns_simple.png create mode 100644 Resources/Textures/Mobs/Customization/horns.rsi/meta.json diff --git a/Resources/Locale/ru-RU/markings/horns.ftl b/Resources/Locale/ru-RU/markings/horns.ftl new file mode 100644 index 0000000000..01d730f7fa --- /dev/null +++ b/Resources/Locale/ru-RU/markings/horns.ftl @@ -0,0 +1,4 @@ +marking-HumanHornsShort = Короткие рожки +marking-HumanHornsSimple = Рожки +marking-SlimeHornsShort = Короткие рожки +marking-SlimeHornsSimple = Рожки \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml new file mode 100644 index 0000000000..87df6a0474 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml @@ -0,0 +1,43 @@ +- type: marking + id: SlimeHornsShort + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [SlimePerson] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: Mobs/Customization/horns.rsi + state: horns_short + +- type: marking + id: SlimeHornsSimple + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [SlimePerson] + coloring: + default: + type: + !type:SkinColoring + sprites: + - sprite: Mobs/Customization/horns.rsi + state: horns_simple + +- type: marking + id: HumanHornsShort + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/horns.rsi + state: horns_short + +- type: marking + id: HumanHornsSimple + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/horns.rsi + state: horns_simple diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf..5f3c581302 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -17,6 +17,7 @@ FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso Eyes: MobHumanoidEyes + HeadTop: MobSlimeMarkingFollowSkin LArm: MobSlimeLArm RArm: MobSlimeRArm LHand: MobSlimeLHand @@ -44,6 +45,9 @@ Arms: points: 4 required: false + HeadTop: #stories? + points: 1 + required: false - type: humanoidBaseSprite id: MobSlimeMarkingFollowSkin diff --git a/Resources/Textures/Mobs/Customization/horns.rsi/horns_short.png b/Resources/Textures/Mobs/Customization/horns.rsi/horns_short.png new file mode 100644 index 0000000000000000000000000000000000000000..dba3b67006790a718757f86d611e5da5e4f86bcf GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`@CW#WxE?rg zz}3}NOH1qg`STk$ZVY!ja~LSaS`y?J%^z~&u%gdXTc>~inQYI%aN+reJ^GK@ngUo?9SmiB&dl(j am^tYuL*hzZuJb_i7(8A5T-G@yGywnwL_$gc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/horns.rsi/horns_simple.png b/Resources/Textures/Mobs/Customization/horns.rsi/horns_simple.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd62c8bab60e90d62ba74e18a23f7a1abddbede GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`@CW#WxE?rg zz}3}NOH1qF!-u044OINT z|JlDQ3MQ*O3;3Tr>Aa%hs+PD)JMLeC!;7an;<~(5bC&m&F)$oRsM+TivC{Uy|EhfU q6 Date: Sun, 17 Nov 2024 10:00:50 +0300 Subject: [PATCH 2/4] Change more stuff --- Resources/Locale/ru-RU/markings/horns.ftl | 4 +-- .../Mobs/Customization/Markings/horns.yml | 30 ++----------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/Resources/Locale/ru-RU/markings/horns.ftl b/Resources/Locale/ru-RU/markings/horns.ftl index 01d730f7fa..e81ec818de 100644 --- a/Resources/Locale/ru-RU/markings/horns.ftl +++ b/Resources/Locale/ru-RU/markings/horns.ftl @@ -1,4 +1,2 @@ marking-HumanHornsShort = Короткие рожки -marking-HumanHornsSimple = Рожки -marking-SlimeHornsShort = Короткие рожки -marking-SlimeHornsSimple = Рожки \ No newline at end of file +marking-HumanHornsSimple = Рожки \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml index 87df6a0474..cd012865b9 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml @@ -1,34 +1,8 @@ -- type: marking - id: SlimeHornsShort - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [SlimePerson] - coloring: - default: - type: - !type:SkinColoring - sprites: - - sprite: Mobs/Customization/horns.rsi - state: horns_short - -- type: marking - id: SlimeHornsSimple - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [SlimePerson] - coloring: - default: - type: - !type:SkinColoring - sprites: - - sprite: Mobs/Customization/horns.rsi - state: horns_simple - - type: marking id: HumanHornsShort bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Human] + speciesRestriction: [Human, SlimePerson] sprites: - sprite: Mobs/Customization/horns.rsi state: horns_short @@ -37,7 +11,7 @@ id: HumanHornsSimple bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Human] + speciesRestriction: [Human, SlimePerson] sprites: - sprite: Mobs/Customization/horns.rsi state: horns_simple From aeca053091f51719e96107d783416b14b108fa9e Mon Sep 17 00:00:00 2001 From: No Elka Date: Sun, 17 Nov 2024 10:27:20 +0300 Subject: [PATCH 3/4] Horns look bad on slimes (sad) --- .../Prototypes/Entities/Mobs/Customization/Markings/horns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml index cd012865b9..5e9bac1d1c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml @@ -2,7 +2,7 @@ id: HumanHornsShort bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Human, SlimePerson] + speciesRestriction: [Human] sprites: - sprite: Mobs/Customization/horns.rsi state: horns_short @@ -11,7 +11,7 @@ id: HumanHornsSimple bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Human, SlimePerson] + speciesRestriction: [Human] sprites: - sprite: Mobs/Customization/horns.rsi state: horns_simple From c048c132cce62ab555aa1eb9b5a4ca56e75a2c15 Mon Sep 17 00:00:00 2001 From: No Elka Date: Mon, 18 Nov 2024 09:56:01 +0300 Subject: [PATCH 4/4] Gotcha boss --- .../Locale/ru-RU/{ => _stories}/markings/horns.ftl | 0 Resources/Prototypes/Species/slime.yml | 4 ---- .../Entities/Mobs/Customization/Markings/horns.yml | 4 ++-- .../Mobs/Customization/horns.rsi/horns_short.png | Bin .../Mobs/Customization/horns.rsi/horns_simple.png | Bin .../Mobs/Customization/horns.rsi/meta.json | 0 6 files changed, 2 insertions(+), 6 deletions(-) rename Resources/Locale/ru-RU/{ => _stories}/markings/horns.ftl (100%) rename Resources/Prototypes/{ => Stories}/Entities/Mobs/Customization/Markings/horns.yml (75%) rename Resources/Textures/{ => Stories}/Mobs/Customization/horns.rsi/horns_short.png (100%) rename Resources/Textures/{ => Stories}/Mobs/Customization/horns.rsi/horns_simple.png (100%) rename Resources/Textures/{ => Stories}/Mobs/Customization/horns.rsi/meta.json (100%) diff --git a/Resources/Locale/ru-RU/markings/horns.ftl b/Resources/Locale/ru-RU/_stories/markings/horns.ftl similarity index 100% rename from Resources/Locale/ru-RU/markings/horns.ftl rename to Resources/Locale/ru-RU/_stories/markings/horns.ftl diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index 5f3c581302..ef49e9b7cf 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -17,7 +17,6 @@ FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso Eyes: MobHumanoidEyes - HeadTop: MobSlimeMarkingFollowSkin LArm: MobSlimeLArm RArm: MobSlimeRArm LHand: MobSlimeLHand @@ -45,9 +44,6 @@ Arms: points: 4 required: false - HeadTop: #stories? - points: 1 - required: false - type: humanoidBaseSprite id: MobSlimeMarkingFollowSkin diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/horns.yml similarity index 75% rename from Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml rename to Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/horns.yml index 5e9bac1d1c..8749793fe3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/horns.yml +++ b/Resources/Prototypes/Stories/Entities/Mobs/Customization/Markings/horns.yml @@ -4,7 +4,7 @@ markingCategory: HeadTop speciesRestriction: [Human] sprites: - - sprite: Mobs/Customization/horns.rsi + - sprite: Stories/Mobs/Customization/horns.rsi state: horns_short - type: marking @@ -13,5 +13,5 @@ markingCategory: HeadTop speciesRestriction: [Human] sprites: - - sprite: Mobs/Customization/horns.rsi + - sprite: Stories/Mobs/Customization/horns.rsi state: horns_simple diff --git a/Resources/Textures/Mobs/Customization/horns.rsi/horns_short.png b/Resources/Textures/Stories/Mobs/Customization/horns.rsi/horns_short.png similarity index 100% rename from Resources/Textures/Mobs/Customization/horns.rsi/horns_short.png rename to Resources/Textures/Stories/Mobs/Customization/horns.rsi/horns_short.png diff --git a/Resources/Textures/Mobs/Customization/horns.rsi/horns_simple.png b/Resources/Textures/Stories/Mobs/Customization/horns.rsi/horns_simple.png similarity index 100% rename from Resources/Textures/Mobs/Customization/horns.rsi/horns_simple.png rename to Resources/Textures/Stories/Mobs/Customization/horns.rsi/horns_simple.png diff --git a/Resources/Textures/Mobs/Customization/horns.rsi/meta.json b/Resources/Textures/Stories/Mobs/Customization/horns.rsi/meta.json similarity index 100% rename from Resources/Textures/Mobs/Customization/horns.rsi/meta.json rename to Resources/Textures/Stories/Mobs/Customization/horns.rsi/meta.json