From c98e76073862e1fe599e7a228bfc633584211998 Mon Sep 17 00:00:00 2001 From: Ruki Date: Wed, 10 Jun 2026 18:23:39 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A0=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=20=D1=81=D0=BA=D0=B0=D1=84=D0=B0=D0=BD=D0=B4=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OuterClothing/base_clothingouter.yml | 73 +++++++++++++++++ .../Clothing/OuterClothing/hardsuits.yml | 22 +++--- .../Clothing/Head/Hardsuits/empire.yml | 10 +-- .../OuterClothing/Hardsuits/empire.yml | 79 ++++++++++--------- .../Clothing/OuterClothing/hardsuits.yml | 2 +- .../OuterClothing/Hardsuits/mercenaries.yml | 18 ++--- .../OuterClothing/Hardsuits/trauma.yml | 4 +- .../_Mono/Loadouts/Mercenary/outer.yml | 2 +- .../Clothing/OuterClothing/hardsuits.yml | 2 +- 9 files changed, 144 insertions(+), 68 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 6a6a3c195cc..b1a3f17c668 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -197,6 +197,79 @@ - type: StaticPrice # Frontier price: 20 # Frontier vendPrice: 1500 # Frontier + +# Forge start +- type: entity + abstract: true + parent: [RecyclableItemClothHardsuit, ClothingOuterBase, GeigerCounterClothing, AllowSuitStorageClothing, ClothingArmorPlate] # Frontier: added RecyclableItemClothHardsuit # Mono - armor plates. + id: ForgeClothingOuterHardsuitBase + name: base hardsuit + components: + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + heatingCoefficient: 0.01 + coolingCoefficient: 0.01 + - type: ClothingSpeedModifier + walkModifier: 0.4 + sprintModifier: 0.6 + - type: Item + size: Ginormous + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.90 + Radiation: 0.25 + - type: ToggleableClothing + - type: ContainerContainer + containers: + toggleable-clothing: !type:Container {} + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + enum.ToggleClothingUiKey.Key: + type: ToggleableClothingBoundUserInterface + - type: GroupExamine + - type: Tag + tags: + - Hardsuit + - WhitelistChameleon + - type: ProtectedFromStepTriggers + slots: WITHOUT_POCKET + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 10 # the average lightbulb only does around four damage! + slots: OUTERCLOTHING + # Goobstation edit start + - type: EmitSoundOnPickup + sound: + path: /Audio/_Goobstation/Items/handling/backpack_pickup.ogg + params: + volume: -4 + - type: EmitSoundOnDrop + sound: + path: /Audio/_Goobstation/Items/handling/backpack_drop.ogg + params: + volume: -4 + - type: EmitSoundOnLand + sound: + path: /Audio/_Goobstation/Items/handling/backpack_drop.ogg + params: + volume: -4 + # Goobstation edit end + - type: HarpyHideWings # Frontier, needed for Harpies + - type: StaticPrice # Frontier + price: 20 # Frontier + vendPrice: 1500 # Frontier +# Forge end - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 70818bd37d6..0b308a44939 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -691,8 +691,8 @@ Radiation: 0.5 Caustic: 0.5 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 0.8 # 0.9->0.8 Forge-change + sprintModifier: 0.8 # 0.9->0.8 Forge-change - type: HeldSpeedModifier - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing @@ -726,13 +726,13 @@ coefficients: Blunt: 0.55 Slash: 0.55 - Piercing: 0.5 - Heat: 0.5 + Piercing: 0.55 # 0.5->0.55 Forge-change + Heat: 0.55 # 0.5->0.55 Forge-change Radiation: 0.35 Caustic: 0.2 - type: ClothingSpeedModifier # Mono - walkModifier: 0.93 - sprintModifier: 0.93 + walkModifier: 0.9 # 0.93->0.9 Forge-change + sprintModifier: 0.9 # 0.93->0.9 Forge-change - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing blockUnequipWhenAttached: false @@ -779,8 +779,8 @@ - type: Item size: Huge - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 # 0.9-> 1 Mono + walkModifier: 0.9 + sprintModifier: 0.9 # 0.9-> 1 Mono, Forge-change revert - type: HeldSpeedModifier - type: StaminaDamageResistance # Mono - Stamres coefficient: 0.45 @@ -1269,7 +1269,7 @@ #ERT Janitor Hardsuit - type: entity - parent: ClothingOuterHardsuitBase # Forge-change + parent: ForgeClothingOuterHardsuitBase # Forge-change id: ClothingOuterHardsuitERTJanitor name: ERT janitor's hardsuit description: A protective hardsuit worn by the janitors of an emergency response team. @@ -1292,8 +1292,8 @@ Radiation: 0.5 Caustic: 0 - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.2 + walkModifier: 1.2 # Forge-change + sprintModifier: 1.2 # Forge-change - type: SpaceFlightProfile thrustMultiplier: 0.7 controlMultiplier: 1.15 diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Head/Hardsuits/empire.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Head/Hardsuits/empire.yml index efa5a82d0ad..4acb33411ef 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Head/Hardsuits/empire.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Head/Hardsuits/empire.yml @@ -93,7 +93,7 @@ # region RI-22 Medium - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitRI22 name: RI-22 helmet description: The interchangeable helmet system for the majority of HVE-14m hardsuits. @@ -124,7 +124,7 @@ - HeadSide - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitRI22c name: RI-22c helmet description: The interchangeable helmet system for the majority of HVE-14m hardsuits. @@ -155,7 +155,7 @@ - HeadSide - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitRI22i name: RI-22 helmet description: The interchangeable helmet system for the majority of HVE-14m hardsuits. @@ -187,7 +187,7 @@ # region HV-7 Heavy - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitHV7 name: HV-7 helmet description: The interchangeable helmet system for the majority of HVE-14m hardsuits. @@ -250,7 +250,7 @@ - HeadSide - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitHVMilitant name: HV MP 0-4 «Militant» helmet description: Higaris Victories' military prototype 0-4, codenamed «Militant». diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/Hardsuits/empire.yml b/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/Hardsuits/empire.yml index 66b936095f7..1d4510f8512 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/Hardsuits/empire.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/Hardsuits/empire.yml @@ -114,17 +114,17 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 + Blunt: 0.7 + Slash: 0.7 Piercing: 0.55 Heat: 0.65 Radiation: 0.65 Caustic: 0.8 - type: StaminaDamageResistance - coefficient: 0.25 + coefficient: 0.3 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 0.95 + sprintModifier: 0.95 - type: HeldSpeedModifier - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing @@ -135,11 +135,11 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 5000 + price: 1000 vendPrice: 1500 - type: entity - parent: ClothingOuterHardsuitRI14 + parent: ForgeClothingOuterHardsuitBase id: ClothingOuterHardsuitRI14m name: RI-14m light medical hardsuit suffix: Empire @@ -149,6 +149,9 @@ sprite: Forge/Clothing/OuterClothing/Hardsuits/empire_light_medic.rsi - type: Clothing sprite: Forge/Clothing/OuterClothing/Hardsuits/empire_light_medic.rsi + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 - type: ExplosionResistance damageCoefficient: 0.75 - type: Armor @@ -157,11 +160,11 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.65 - Heat: 0.7 + Heat: 0.75 Radiation: 0.4 Caustic: 0.3 - type: StaminaDamageResistance - coefficient: 0.4 + coefficient: 0.2 - type: ClothingSpeedModifier walkModifier: 1.1 sprintModifier: 1.1 @@ -174,7 +177,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 5000 + price: 1000 vendPrice: 15000 - type: entity @@ -190,10 +193,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.6 - Heat: 0.5 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.55 + Heat: 0.6 Radiation: 0.65 Caustic: 0.8 - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits @@ -205,7 +208,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 5000 + price: 1000 vendPrice: 15000 # region RI-22 Medium @@ -232,8 +235,8 @@ coefficients: Blunt: 0.45 Slash: 0.45 - Piercing: 0.45 - Heat: 0.5 + Piercing: 0.4 + Heat: 0.4 Shock: 0.7 Radiation: 0.5 Caustic: 0.7 @@ -241,8 +244,8 @@ - type: StaminaDamageResistance coefficient: 0.4 - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 + walkModifier: 0.9 + sprintModifier: 0.9 - type: SpaceFlightProfile thrustMultiplier: 0.7 controlMultiplier: 1.15 @@ -258,7 +261,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 12500 + price: 2000 vendPrice: 50000 - type: entity @@ -275,13 +278,13 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.35 - Shock: 0.6 - Radiation: 0.2 - Caustic: 0.5 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.4 + Heat: 0.4 + Shock: 0.7 + Radiation: 0.5 + Caustic: 0.7 Poison: 0.8 # Mono - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing @@ -292,7 +295,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 10000 + price: 2000 vendPrice: 50000 - type: entity @@ -309,13 +312,13 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.35 - Heat: 0.6 - Shock: 0.8 - Radiation: 0.4 - Caustic: 0.5 + Blunt: 0.45 + Slash: 0.45 + Piercing: 0.4 + Heat: 0.4 + Shock: 0.7 + Radiation: 0.5 + Caustic: 0.7 Poison: 0.8 # Mono - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing @@ -326,7 +329,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 12500 + price: 2000 vendPrice: 5000 # region ~HV~RI-7 Heavy @@ -358,7 +361,7 @@ Piercing: 0.15 Heat: 0.3 Shock: 0.6 - Radiation: 0.6 + Radiation: 0.2 Caustic: 0.6 Poison: 0.8 - type: StaminaDamageResistance @@ -381,7 +384,7 @@ helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaticPrice - price: 10000 + price: 30000 vendPrice: 80000 - type: entity diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/hardsuits.yml index ece43d282c1..0d8bfffc2a5 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/OuterClothing/hardsuits.yml @@ -378,7 +378,7 @@ # Trauma - type: entity - parent: [ClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] + parent: [ForgeClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] id: ClothingOuterHardsuitTraumaShooter name: armed trauma unit T-45 tacsuit suffix: TTI diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercenaries.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercenaries.yml index f88c226bcb2..8ad56fc0ac7 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercenaries.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercenaries.yml @@ -23,8 +23,8 @@ Radiation: 0.6 Caustic: 0.8 - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 + walkModifier: 0.9 # 0.95-> 0.9 Forge-change + sprintModifier: 0.9 # 0.95-> 0.9 Forge-change - type: HeldSpeedModifier - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing @@ -53,20 +53,20 @@ - type: Armor modifiers: coefficients: # Mono - all of these values are changed - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.45 # Mono - Heat: 0.55 + Blunt: 0.6 # 0.5-> 0.6 Forge-change + Slash: 0.6 # 0.5-> 0.6 Forge-change + Piercing: 0.5 # Mono, 0.45-> 0.5 Forge-change + Heat: 0.6 # 0.45-> 0.6 Forge-change Radiation: 0.5 # Added Radiation Resist Caustic: 0.65 - type: ExplosionResistance - damageCoefficient: 0.35 + damageCoefficient: 0.5 # 0.35-> 0.5 Forge-change - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 - type: ClothingSpeedModifier # Mono - Armor Value Changes - walkModifier: 0.825 - sprintModifier: 0.825 + walkModifier: 0.85 # 0.825-> 0.85 Forge-change + sprintModifier: 0.85 # 0.825-> 0.85 Forge-change - type: HeldSpeedModifier - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/trauma.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/trauma.yml index 3334281be95..057aaeee11e 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/trauma.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/trauma.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] # Forge-change parent BaseFactionGearOtherFactionT1 + parent: [ForgeClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] # Forge-change parent BaseFactionGearOtherFactionT1, add ForgeClothingOuterHardsuitBase id: ClothingOuterHardsuitTrauma name: armed trauma unit T-23 tacsuit suffix: TTI # Forge @@ -43,7 +43,7 @@ vendPrice: 10000 - type: entity - parent: [ClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] # Forge-change parent BaseFactionGearOtherFactionT1 + parent: [ForgeClothingOuterHardsuitBase, BaseFactionGearOtherFactionT1] # Forge-change parent BaseFactionGearOtherFactionT1, add ForgeClothingOuterHardsuitBase id: ClothingOuterHardsuitTraumaLeader name: armed trauma unit T-53 tacsuit suffix: TTI # Forge diff --git a/Resources/Prototypes/_Mono/Loadouts/Mercenary/outer.yml b/Resources/Prototypes/_Mono/Loadouts/Mercenary/outer.yml index f7bee568b33..8126babe625 100644 --- a/Resources/Prototypes/_Mono/Loadouts/Mercenary/outer.yml +++ b/Resources/Prototypes/_Mono/Loadouts/Mercenary/outer.yml @@ -68,6 +68,6 @@ - type: loadout id: MercenaryClothingOuterHardsuitMercenaryWarlord - price: 50000 + price: 30000 # 50000->30000 Forge-change equipment: outerClothing: ClothingOuterHardsuitMercenaryWarlord diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index bd0b65a7ff2..957932ddbd7 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -98,7 +98,7 @@ #ERT Mail Carrier Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase] # Forge-change + parent: ForgeClothingOuterHardsuitBase # Forge-change id: ClothingOuterHardsuitERTMailCarrier name: ERT mail carrier's hardsuit description: A protective hardsuit worn by the mail carriers of an emergency response team. From 51c1331d7c9f46063b2ea35f36258ac8d3b85532 Mon Sep 17 00:00:00 2001 From: Ruki Date: Thu, 11 Jun 2026 19:18:05 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D0=BA=D0=B0=D1=84=D0=B0=D0=BD=D0=B4=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=9E=D0=91=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0b308a44939..70e608a64dd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -1117,7 +1117,7 @@ Caustic: 0.2 - type: ClothingSpeedModifier walkModifier: 0.9 - sprintModifier: 0.6 + sprintModifier: 0.5 # Forge-change 0.6 -> 0.5 - type: HeldSpeedModifier - type: StaminaDamageResistance coefficient: 0.5 @@ -1203,7 +1203,7 @@ Caustic: 0.2 - type: ClothingSpeedModifier walkModifier: 1.0 - sprintModifier: 0.95 + sprintModifier: 0.9 # Forge-change 0.95 -> 0.9 - type: HeldSpeedModifier - type: StaminaDamageResistance coefficient: 0.5 @@ -1246,7 +1246,7 @@ Caustic: 0.8 - type: ClothingSpeedModifier walkModifier: 1.0 - sprintModifier: 0.9 + sprintModifier: 0.8 # Forge-change 0.9 -> 0.8 - type: HeldSpeedModifier - type: StaminaDamageResistance coefficient: 0.5