From 48f6b53444a9017a7f9b215d4398a4b6862fd740 Mon Sep 17 00:00:00 2001 From: Username228 Date: Sat, 22 Jun 2024 20:55:41 +0300 Subject: [PATCH 1/2] hardfix --- .../Clothing/Head/hardsuit-helmets.yml | 3 +- .../Entities/Clothing/Head/eva-helmets.yml | 36 +++++----- .../Clothing/OuterClothing/softsuits.yml | 68 +++++++++---------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml index 8edf6a640f0..acb3365a6df 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml @@ -191,6 +191,7 @@ name: helmet of a paramedic's spacesuit description: Helmet to a paramedic's void spacesuit for going into space. Does not differ in large protective characteristics. components: + - type: BreathMask - type: Sprite sprite: ADT/Clothing/Head/Hardsuits/paramedic_helmet.rsi - type: Clothing @@ -715,7 +716,7 @@ id: ClothingHeadHelmetHardsuitBlueshield noSpawn: true name: blueshield hardsuit helmet - description: + description: components: - type: Sprite sprite: ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 963bcdedd78..16cd0093f38 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -55,24 +55,24 @@ sprite: Clothing/Head/Helmets/cosmonaut.rsi #Paramedic Void Helmet -- type: entity - parent: ClothingHeadEVAHelmetBase - id: ClothingHeadHelmetVoidParamed - name: paramedic void helmet - description: A void helmet made for paramedics. - components: - - type: BreathMask - - type: Sprite - sprite: Clothing/Head/Helmets/paramedhelm.rsi - - type: Clothing - sprite: Clothing/Head/Helmets/paramedhelm.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Heat: 0.90 - Radiation: 0.75 +#- type: entity +# parent: ClothingHeadEVAHelmetBase +# id: ClothingHeadHelmetVoidParamed +# name: paramedic void helmet +# description: A void helmet made for paramedics. +# components: +# - type: BreathMask +# - type: Sprite +# sprite: Clothing/Head/Helmets/paramedhelm.rsi +# - type: Clothing +# sprite: Clothing/Head/Helmets/paramedhelm.rsi +# - type: TemperatureProtection +# coefficient: 0.1 +# - type: Armor +# modifiers: +# coefficients: +# Heat: 0.90 +# Radiation: 0.75 #Ancient Void Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 58faf268470..1ab8a785868 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -91,37 +91,37 @@ #Paramedic Voidsuit #Despite having resistances and looking like a hardsuit, this parents off the EVA suit so it goes here. -- type: entity - parent: ClothingOuterEVASuitBase - id: ClothingOuterHardsuitVoidParamed - name: paramedic void suit - description: A void suit made for paramedics. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 - - type: HeldSpeedModifier - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Heat: 0.90 - Radiation: 0.75 - Caustic: 0.5 - - type: GroupExamine - - type: StealTarget - stealGroup: ClothingOuterHardsuitVoidParamed - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetVoidParamed - slot: head - - type: ContainerContainer - containers: - toggleable-clothing: !type:ContainerSlot {} +#- type: entity +# parent: ClothingOuterEVASuitBase +# id: ClothingOuterHardsuitVoidParamed +# name: paramedic void suit +# description: A void suit made for paramedics. +# components: +# - type: Sprite +# sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi +# - type: Clothing +# sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi +# - type: PressureProtection +# highPressureMultiplier: 0.5 +# lowPressureMultiplier: 1000 +# - type: ClothingSpeedModifier +# walkModifier: 0.9 +# sprintModifier: 0.9 +# - type: HeldSpeedModifier +# - type: TemperatureProtection +# coefficient: 0.1 +# - type: Armor +# modifiers: +# coefficients: +# Heat: 0.90 +# Radiation: 0.75 +# Caustic: 0.5 +# - type: GroupExamine +# - type: StealTarget +# stealGroup: ClothingOuterHardsuitVoidParamed +# - type: ToggleableClothing +# clothingPrototype: ClothingHeadHelmetVoidParamed +# slot: head +# - type: ContainerContainer +# containers: +# toggleable-clothing: !type:ContainerSlot {} From 8076d677d813efd8e8f94f524ce4c995e9a98ecc Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Tue, 25 Jun 2024 00:54:18 +0300 Subject: [PATCH 2/2] Update medical.yml --- Resources/Prototypes/Catalog/Fills/Lockers/medical.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 3a87a0e274a..36197581617 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -146,7 +146,6 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitVoidParamed - id: ADTPatchPackFilled - id: ADTClothingOuterParamedicVoidHardsuit - id: ClothingOuterCoatParamedicWB @@ -167,4 +166,4 @@ - id: MedkitFilled prob: 0.3 - id: ADTClothingHeadHatHoodBioParamedic - - id: ADTClothingOuterBioParamedic \ No newline at end of file + - id: ADTClothingOuterBioParamedic