Rad suit swag and toggleable now (#23854)

* troll

* Update hoods.yml

* Update hoods.yml

* Update suits.yml

* Update engineer.yml

* Update migration.yml

* Update emergency.yml

* forgor

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
index c68dec780fbde30897d929558ae4c42d8bb21945..41278346d451d4db28a579f2383051009143016b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
@@ -87,8 +87,6 @@
     contents:
       - id: ClothingOuterSuitRad
         amount: 2
-      - id: ClothingHeadHatHoodRad
-        amount: 2
       - id: GeigerCounter
         amount: 2
       - id: DrinkVodkaBottleFull

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 8c6e70316853a7f4382dc4b59bf4e4378fd3693e..1e48431295160a6482a33adaede0d752fe51cfa9 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -146,8 +146,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHatHoodRad
-        amount: 2
       - id: ClothingOuterSuitRad
         amount: 2
       - id: GeigerCounter

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 35a56f4fde3a1d0cbb962e09182daae7e62e0fb1..b411131d292142f6ce365d687374a8b57e2129a6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -131,6 +131,10 @@
       coefficients:
         Heat: 0.95
         Radiation: 0.65
+  - type: BreathMask
+  - type: Tag
+    tags:
+    - HidesHair
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 94f1d584eb1399be801233bbd82832c483add055..96a97be87ecee6b64019b4b191f0d06f7059cdd0 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -110,11 +110,17 @@
     modifiers:
       coefficients:
         Heat: 0.90
-        Radiation: 0.05
+        Radiation: 0.001
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/rad.rsi
   - type: GroupExamine
-
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodRad
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+      
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterSuitSpaceNinja

diff --git a/Resources/migration.yml b/Resources/migration.yml
index afb581d31573d964143e1e97107c4d9c180293c6..0d2168f66e5a42533da74824f197953584593e2c 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -153,3 +153,5 @@ AnalyzerSubspaceStockPart: null
 CrystalSubspaceStockPart: null
 TransmitterSubspaceStockPart: null
 
+# 2024-01-10
+ClothingHeadHatHoodRad: null