Chaplain Hoodie change (#20096)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index 518227ba84b2683b75f4a8ae2e9d37ce707f9e52..c90a5bce143b5eceb455e231cc1650683a6849de 100644 (file)
--- 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 38bfcc879dc558b30f73e000f6f32859cd481105..35a56f4fde3a1d0cbb962e09182daae7e62e0fb1 100644 (file)
--- 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 c11e981ebbba2e22d3f7aa34e83ab082da13f1c5..3a2c649da6f9153788271930b00e9c875126b618 100644 (file)
--- 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 301dcbb1b2178e40c0e512801c406de7b719e59a..a7c3a553384a2bfda1f96733a4016a191b2400e6 100644 (file)
--- 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 f343386b0b4697b186cf9d241315290147d6ee8e..4c14f478192225c0cf7406224caad8d7bdbb3911 100644 (file)
--- 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