Toggleable Hardsuit Helmets (#7559)

2022-04-23 15:31:45 +12:00
parent 83b47c43c0
commit 1141c19d76
34 changed files with 449 additions and 49 deletions
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -15,6 +15,14 @@
  iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
  event: !type:ToggleActionEvent

+- type: instantAction
+  id: ToggleSuitHelmet
+  name: action-name-hardsuit
+  description: action-description-hardsuit
+  itemIconStyle: BigItem
+  useDelay: 1 # equip noise spam.
+  event: !type:ToggleClothingEvent
+
 - type: entityTargetAction
  id: Disarm
  name: action-name-disarm
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -189,4 +189,3 @@
  - type: StorageFill
    contents:
      - id: ClothingOuterHardsuitSyndie
-      - id: ClothingHeadHelmetHardsuitSyndie
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -7,7 +7,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingHeadHelmetHardsuitSalvage
      - id: ClothingOuterHardsuitSalvage
      - id: ClothingMaskBreath
      - id: OxygenTankFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -9,7 +9,6 @@
      - id: ClothingOuterHardsuitSalvage
      - id: YellowOxygenTank
      - id: ClothingShoesBootsMag
-      - id: ClothingHeadHelmetHardsuitSalvage
      - id: ClothingMaskGasExplorer
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
 #      - id: ClothingEyesGlassesMeson
@@ -17,6 +16,5 @@
      - id: FlashlightSeclite
      - id: SurvivalKnife
      - id: ClothingOuterHardsuitSpatio
-      - id: ClothingHeadHelmetHardsuitSpatio


--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -78,7 +78,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingHeadHelmetHardsuitAtmos
      - id: ClothingOuterHardsuitAtmos
      - id: ClothingMaskGasAtmos
      - id: OxygenTankFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -40,7 +40,6 @@
      - id: ClothingOuterHardsuitCap
      - id: ClothingMaskGasCaptain
      - id: TaserGun
-      - id: ClothingHeadHelmetHardsuitCap
      - id: CommsComputerCircuitboard
      - id: ClothingHeadsetAltCommand
      - id: SpaceCash1000
@@ -91,7 +90,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingHeadHelmetHardsuitEngineeringWhite
      - id: ClothingOuterHardsuitEngineeringWhite
      - id: ClothingMaskBreath
      - id: OxygenTankFilled
@@ -120,7 +118,6 @@
      - id: ClothingBackpackDuffelSurgeryFilled
      - id: ClothingOuterCoatLabCmo
      - id: ClothingMaskSterile
-      - id: ClothingHeadHelmetHardsuitMedical
      - id: ClothingOuterHardsuitMedical
      - id: DiagnoserMachineCircuitboard
      - id: VaccinatorMachineCircuitboard
@@ -142,7 +139,6 @@
      - id: CircuitImprinterMachineCircuitboard
      - id: ClothingNeckCloakRd
      - id: ClothingHeadsetMedicalScience
-      - id: ClothingHeadHelmetHardsuitRd
      - id: ClothingOuterHardsuitRd
      - id: PlushieSlime
        prob: 0.1
@@ -171,7 +167,6 @@
        prob: 0.1
      - id: ClothingUniformJumpskirtHoSParadeMale
        prob: 0.1
-      - id: ClothingHeadHelmetHardsuitSecurityRed
      - id: ClothingOuterHardsuitSecurityRed
      - id: ClothingMaskGasSecurity
      - id: ClothingShoeSlippersDuck
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -9,5 +9,5 @@
    Slots: [belt]
    size: 50
    quickEquip: false
-    EquipSound:
+    equipSound:
      path: /Audio/Items/belt_equip.ogg
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -48,9 +48,15 @@
  parent: ClothingHeadBase
  id: ClothingHeadHardsuitBase
  name: base hardsuit helmet
+  noSpawn: true
  components:
  - type: Clothing
+    #Apparently the hardsuit helmet equip sound is from a walking mech?
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
    size: 15
+    canPickup: false # attached to suit.
+    quickEquip: false
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 1000
@@ -76,6 +82,7 @@
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHardsuitWithLightBase
  name: base hardsuit helmet with light
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -1,6 +1,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitAtmos
+  noSpawn: true
  name: atmos hardsuit helmet
  description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
  components:
@@ -62,6 +63,7 @@
 - type: entity
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHelmetHardsuitCap
+  noSpawn: true
  name: captain's hardsuit helmet
  description: Special hardsuit helmet, made for the captain of the station.
  components:
@@ -76,6 +78,7 @@
 - type: entity
  parent: HatBase
  id: ClothingHeadHelmetHardsuitDeathsquad
+  noSpawn: true
  name: deathsquad hardsuit helmet
  description: A robust helmet for special operations.
  components:
@@ -90,6 +93,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitEngineering
+  noSpawn: true
  name: engineering hardsuit helmet
  description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
  components:
@@ -104,6 +108,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitEngineeringWhite
+  noSpawn: true
  name: chief engineer's hardsuit helmet
  description: Special hardsuit helmet, made for the chief engineer of the station.
  components:
@@ -118,6 +123,7 @@
 - type: entity
  parent: HatBase
  id: ClothingHeadHelmetIHSVoidHelm
+  noSpawn: true
  name: IHS voidhelm
  description: A robust, tactical IHS helmet.
  components:
@@ -132,6 +138,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitMedical
+  noSpawn: true
  name: chief medical officer's hardsuit helmet
  description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
  components:
@@ -148,6 +155,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitRd
+  noSpawn: true
  name: experimental research hardsuit helmet
  description: Lightweight hardsuit helmet that doesn't restrict your head movements.
  components:
@@ -162,6 +170,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitSalvage
+  noSpawn: true
  name: salvage hardsuit helmet
  description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
  components:
@@ -176,6 +185,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitSecurity
+  noSpawn: true
  name: security hardsuit helmet
  description: Armored hardsuit helmet for security needs.
  components:
@@ -190,6 +200,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitSecurityRed
+  noSpawn: true
  name: head of security's hardsuit helmet
  description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
  components:
@@ -204,6 +215,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitSyndie
+  noSpawn: true
  name: blood red hardsuit helmet
  description: An advanced red hardsuit helmet designed for work in special operations.
  components:
@@ -220,6 +232,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitWizard
+  noSpawn: true
  name: wizard hardsuit helmet
  description: A bizarre gem-encrusted helmet that radiates magical energies.
  components:
@@ -234,6 +247,7 @@
 - type: entity
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHelmetHardsuitLing
+  noSpawn: true
  name: organic space helmet
  description: A spaceworthy biomass of pressure and temperature resistant tissue.
  components:
@@ -248,6 +262,7 @@
 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
  id: ClothingHeadHelmetHardsuitSpatio
+  noSpawn: true
  name: spationaut hardsuit helmet
  description: A sturdy helmet designed for complex industrial operations in space. 
  components:
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -35,6 +35,7 @@
        Radiation: 0.25
  - type: DiseaseProtection
    protection: 0.05
+  - type: ToggleableClothing

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -26,7 +26,9 @@
    coefficient: 0.01
  - type: ExplosionResistance
    resistance: 0.8
-    
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitAtmos
+
 - type: entity
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitCap
@@ -53,6 +55,8 @@
        Radiation: 0.1
  - type: ExplosionResistance
    resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitCap

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -80,6 +84,8 @@
        Radiation: 0.2
  - type: ExplosionResistance
    resistance: 0.3
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -107,7 +113,9 @@
        Radiation: 0.35
  - type: ExplosionResistance
    resistance: 0.8
-    
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitEngineering
+
 - type: entity
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitEngineeringWhite
@@ -134,6 +142,8 @@
        Radiation: 0.25
  - type: ExplosionResistance
    resistance: 0.8
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitEngineeringWhite

 #The voidsuit and eva suit are not techically 'hardsuits' but this seems to be the place for all EVA-capable outer clothing. This may be worth reevaluating when we have a lot more items.
 - type: entity
@@ -152,6 +162,8 @@
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 10000
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetIHSVoidHelm

 - type: entity
  parent: ClothingOuterEVASuitBase
@@ -210,7 +222,9 @@
    modifiers:
      coefficients:
        Heat: 0.90
-        Radiation: 0.25 
+        Radiation: 0.25
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitMedical

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -238,6 +252,8 @@
    sprintModifier: 0.75
  - type: ExplosionResistance
    resistance: 0.7
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitRd

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -265,6 +281,8 @@
        Radiation: 0.5
  - type: ExplosionResistance
    resistance: 0.8
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSalvage

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -289,6 +307,8 @@
        Radiation: 0.25
  - type: ExplosionResistance
    resistance: 0.6
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSecurity

 - type: entity
  parent: ClothingOuterHardsuitSecurity 
@@ -316,6 +336,8 @@
        Radiation: 0.25
  - type: ExplosionResistance
    resistance: 0.6
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -343,6 +365,8 @@
        Radiation: 0.20
  - type: ExplosionResistance
    resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSyndie

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -370,6 +394,8 @@
        Radiation: 0.20
  - type: ExplosionResistance
    resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitWizard

 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -397,6 +423,8 @@
        Radiation: 0.3
  - type: ExplosionResistance
    resistance: 0.8 
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitLing
   
 - type: entity
  parent: ClothingOuterHardsuitBase
@@ -422,6 +450,8 @@
        Piercing: 0.95
        Heat: 0.9
        Radiation: 0.5 #low physical but gave some rad protection in case of rad artifacts/rad storms
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSpatio

 - type: entity
  parent: ClothingOuterEVASuitBase
@@ -449,4 +479,3 @@
        Slash: 0.95
        Heat: 0.90
        Radiation: 0.75
-        
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -19,7 +19,7 @@
    state: icon
  - type: Clothing
    Slots: [innerclothing]
-    EquipSound:
+    equipSound:
      path: /Audio/Items/jumpsuit_equip.ogg
  - type: Butcherable
    butcheringType: Knife
@@ -37,7 +37,7 @@
  - type: Clothing
    Slots: [innerclothing]
    femaleMask: UniformTop
-    EquipSound:
+    equipSound:
      path: /Audio/Items/jumpsuit_equip.ogg
  - type: Butcherable
    butcheringType: Knife
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -52,7 +52,6 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitColorBlack
    back: ClothingBackpackDuffelSyndicateAmmo
-    head: ClothingHeadHelmetHardsuitDeathsquad
    mask: ClothingMaskBreath
    eyes: ClothingEyesGlassesSecurity
    ears: ClothingHeadsetCentCom
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -46,7 +46,6 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitColorPurple
    back: ClothingBackpackFilled
-    head: ClothingHeadHelmetHardsuitWizard
    outerClothing: ClothingOuterHardsuitWizard
    shoes: ClothingShoesWizard
    id: AssistantPDA