From 19265370b1b0c6fb4d073630f5bcdff53bbbd75d Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Mon, 4 Nov 2024 04:09:07 -0400 Subject: [PATCH 01/10] Sprite the actual hood, tell me what I'm missing. --- .../Coat/hoodmail.rsi/equipped-HELMET.png | Bin 0 -> 504 bytes .../Head/Hoods/Coat/hoodmail.rsi/icon.png | Bin 0 -> 363 bytes .../Head/Hoods/Coat/hoodmail.rsi/meta.json | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..6062386142f4b9dce150b358886c086ba7a5885a GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}zK7Rh@`kf~-Y8k@P;qr!A$`<8H)?G42MdC`?mcGYy-RDYah5^;? zKln`^Nb!~g`33(+0t~hanMpyiI9E{-7)?r*0ZEIO>f z1+lkeyM_iw$zk|!$c&g9>_VP?-!j{T7=$rI)3L)bkc>&>dJYrJ=##?PrK{^Hv6 zy9%kR&Ui0vX!zcFkHdXV(ORi1Rw_$sl+`lca=6bBjy|Fp{bcIpQ%V9g_pE=g=}ct4 zw~e<&$TC7FN{M|5i`K+ub%k{YcQ#jDe-Ova&fvkB#GbO-;GVn10kc!T8<`bfeEuTi zkUd@g{9gxQ1I9(1GZ-$i^f0XL-PNSEJ?-K`xeG2k6mNWR^?1P|{q7aRueBG7gi@eEeM1MG8=`$J50z#KQmW1aH2>3Oua2Jb5dmZ+$uZw?9fmdKDSix(ovij@dB_8OAU3F_HS+A@K85(QFH*Z?>s9 z9cPpdSyu9PJ}=V$;}O@)739LYzHwUR-Xz8KiWAIiHrGD4NUB&{@qfV{b30qpo`NHq eCjUgU{xU_*^KV@+X^$MxT@0SCelF{r5}E*RnSkK{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/meta.json new file mode 100644 index 00000000000..86fc1cfea61 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Monotheonist for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file From ee79ce458b62707d4ad97408d1ce53bd48ef052d Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 15 Nov 2024 06:43:32 -0400 Subject: [PATCH 02/10] Does the yaml thing, because me two weeks ago was a tired --- .../Nyanotrasen/Entities/Clothing/Head/hoods.yml | 13 +++++++++++++ .../Entities/Clothing/OuterClothing/wintercoats.yml | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hoods.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..405ed6e4a94 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,13 @@ +#Be sure to link back to the appropriate winter coats here (mostly in the nyanotrasen folder.) If this is a non-winter coat hood, then do whatever. + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterMailCarrier + categories: [ HideSpawnMenu ] + name: mail carrier's winter coat hood + description: A hood for keeping the humble mailman's head warm while making all those deliveries. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hoods/Coat/hoodmail.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 8b8e83507a2..d3f6358b0d7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -39,6 +39,8 @@ name: mail carrier's winter coat description: It'll keep away the cold but not the dogs. components: + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterMailCarrier #DeltaV - fixing the fact that it has no hood - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From cbfb7a12f7355101e28d95a53ae36e7baa7a1b77 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 16 Nov 2024 01:09:37 -0400 Subject: [PATCH 03/10] moving the comment --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index d3f6358b0d7..74dc97d3a1a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -39,8 +39,8 @@ name: mail carrier's winter coat description: It'll keep away the cold but not the dogs. components: - - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodWinterMailCarrier #DeltaV - fixing the fact that it has no hood + - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood + clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From 38c361586fcdd234c379c45eee16ffbab120e428 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:06:55 -0400 Subject: [PATCH 04/10] Build and test will you ever be satisfied? --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 74dc97d3a1a..fe688bb227d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -41,6 +41,15 @@ components: - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood clothingPrototype: ClothingHeadHatHoodWinterMailCarrier + - type: ContainerContainer + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] + toggleable-clothing: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From 3331e4d18a60e950ff6384290cc244515ced20e1 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:15:36 -0400 Subject: [PATCH 05/10] THE LINTER --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 4 ++-- RobustToolbox | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index fe688bb227d..8d6456fafa3 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -42,11 +42,11 @@ - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer - storagebase: !type:Container + storagebase: !type:Container showEnts: False occludes: True ents: [] - toggleable-clothing: !type:ContainerSlot + toggleable-clothing: !type:ContainerSlot showEnts: False occludes: True ent: null diff --git a/RobustToolbox b/RobustToolbox index 92b0e7f1a85..32bca7cfd41 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66 +Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af From 392b3eecfb10448b842758bca84ef7c4ec9be7c4 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:32:39 -0400 Subject: [PATCH 06/10] Mono breaks robusttoolbox with his shitcode --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 8d6456fafa3..3790e796951 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -43,13 +43,13 @@ clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer storagebase: !type:Container - showEnts: False - occludes: True - ents: [] + showEnts: False + occludes: True + ents: [] toggleable-clothing: !type:ContainerSlot - showEnts: False - occludes: True - ent: null + showEnts: False + occludes: True + ent: null - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From 70d0d36e2923b4e2a56ec1018e14d427658096d9 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:45:46 -0400 Subject: [PATCH 07/10] Revert "Mono breaks robusttoolbox with his shitcode" This reverts commit 392b3eecfb10448b842758bca84ef7c4ec9be7c4. --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 3790e796951..8d6456fafa3 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -43,13 +43,13 @@ clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer storagebase: !type:Container - showEnts: False - occludes: True - ents: [] + showEnts: False + occludes: True + ents: [] toggleable-clothing: !type:ContainerSlot - showEnts: False - occludes: True - ent: null + showEnts: False + occludes: True + ent: null - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From c233cd8da48ef4eff134e907d61afa108f050932 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:45:51 -0400 Subject: [PATCH 08/10] Revert "THE LINTER" This reverts commit 3331e4d18a60e950ff6384290cc244515ced20e1. --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 4 ++-- RobustToolbox | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 8d6456fafa3..fe688bb227d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -42,11 +42,11 @@ - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer - storagebase: !type:Container + storagebase: !type:Container showEnts: False occludes: True ents: [] - toggleable-clothing: !type:ContainerSlot + toggleable-clothing: !type:ContainerSlot showEnts: False occludes: True ent: null diff --git a/RobustToolbox b/RobustToolbox index 32bca7cfd41..92b0e7f1a85 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af +Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66 From 8b37ac5775fa9b4f063f19b6d75033f2a8077bbb Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:51:55 -0400 Subject: [PATCH 09/10] Okay let's try this again --- .../Clothing/OuterClothing/wintercoats.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index fe688bb227d..085cf888fdf 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -42,14 +42,14 @@ - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] toggleable-clothing: !type:ContainerSlot - showEnts: False - occludes: True - ent: null + showEnts: False + occludes: True + ent: null - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/WinterCoats/mail_winter_coat.rsi - type: Clothing From cc7dfaa133a4004fa275409612cf74583b99e2c9 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:58:49 -0400 Subject: [PATCH 10/10] Mono, you press Tab too much. --- .../Entities/Clothing/OuterClothing/wintercoats.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml index 085cf888fdf..0284c26a99e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/wintercoats.yml @@ -42,11 +42,12 @@ - type: ToggleableClothing #DeltaV - fixing the fact that it has no hood clothingPrototype: ClothingHeadHatHoodWinterMailCarrier - type: ContainerContainer + containers: storagebase: !type:Container showEnts: False occludes: True ents: [] - toggleable-clothing: !type:ContainerSlot + toggleable-clothing: !type:ContainerSlot showEnts: False occludes: True ent: null