From cfeb43132655455baf9fa099fd4c5d3eb32ecde7 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 10 Jan 2024 02:54:29 -0700 Subject: [PATCH] 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> --- .../Prototypes/Catalog/Fills/Crates/emergency.yml | 2 -- .../Prototypes/Catalog/Fills/Lockers/engineer.yml | 2 -- Resources/Prototypes/Entities/Clothing/Head/hoods.yml | 4 ++++ .../Entities/Clothing/OuterClothing/suits.yml | 10 ++++++++-- Resources/migration.yml | 2 ++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml index c68dec780f..41278346d4 100644 --- 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 8c6e703168..1e48431295 100644 --- 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 35a56f4fde..b411131d29 100644 --- 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 94f1d584eb..96a97be87e 100644 --- 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 afb581d315..0d2168f66e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -153,3 +153,5 @@ AnalyzerSubspaceStockPart: null CrystalSubspaceStockPart: null TransmitterSubspaceStockPart: null +# 2024-01-10 +ClothingHeadHatHoodRad: null