From 470254276fdf0e60e7756f18f6321a9bfa0c1391 Mon Sep 17 00:00:00 2001 From: peptron1 <57651027+peptron1@users.noreply.github.com> Date: Sun, 17 Sep 2023 21:10:44 -0400 Subject: [PATCH] Chaplain Hoodie change (#20096) --- .../VendingMachines/Inventories/chapel.yml | 3 +- .../Entities/Clothing/Head/hoods.yml | 5 ++-- .../OuterClothing/base_clothingouter.yml | 29 +++++++++++++++++++ .../Entities/Clothing/OuterClothing/coats.yml | 4 ++- .../Entities/Clothing/OuterClothing/misc.yml | 6 ++-- 5 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 518227ba84..c90a5bce14 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: PietyVendInventory startingInventory: ClothingUniformJumpsuitChaplain: 2 @@ -7,7 +7,6 @@ ClothingUniformJumpsuitMonasticRobeLight: 1 ClothingOuterHoodieChaplain: 1 ClothingOuterHoodieBlack: 1 - ClothingHeadHatHoodChaplainHood: 1 ClothingHeadHatHoodNunHood: 1 ClothingOuterNunRobe: 1 ClothingHeadHatFez: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 38bfcc879d..35a56f4fde 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -19,7 +19,7 @@ id: ClothingHeadHatHoodBioCmo name: bio hood suffix: CMO - description: An advanced hood for chief medical officer that protects the head and face from biological contaminants. + description: An advanced hood for chief medical officers that protects the head and face from biological contaminants. components: - type: Sprite sprite: Clothing/Head/Hoods/Bio/cmo.rsi @@ -77,7 +77,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodChaplainHood - name: chaplain hood + noSpawn: true + name: chaplain's hood description: Maximum piety in this star system. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index c11e981ebb..3a2c649da6 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -43,6 +43,20 @@ - type: StaticPrice price: 80 +- type: entity + abstract: true + parent: ClothingOuterStorageBase + id: ClothingOuterStorageToggleableBase + components: + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterDefault + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + storagebase: !type:Container + ents: [] + - type: entity abstract: true parent: [ClothingOuterBase, GeigerCounterClothing] @@ -94,3 +108,18 @@ sprintModifier: 0.8 - type: Item size: 80 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterBaseToggleable + name: hoodie with hood + abstract: True + components: + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterDefault + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + storagebase: !type:Container + ents: [] diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 301dcbb1b2..a7c3a55338 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -74,7 +74,7 @@ sprite: Clothing/OuterClothing/Coats/insp_coat.rsi - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterStorageToggleableBase id: ClothingOuterCoatJensen name: jensen coat description: A jensen coat. @@ -83,6 +83,8 @@ sprite: Clothing/OuterClothing/Coats/jensencoat.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/jensencoat.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodChaplainHood - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index f343386b0b..4c14f47819 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -92,15 +92,17 @@ proto: robot - type: entity - parent: ClothingOuterBase + parent: ClothingOuterBaseToggleable id: ClothingOuterHoodieChaplain - name: chaplain hoodie + name: chaplain's hoodie description: Black and strict chaplain hoodie. components: - type: Sprite sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodChaplainHood - type: entity parent: ClothingOuterBase -- 2.51.2