From: Nairod <110078045+Nairodian@users.noreply.github.com>
Date: Wed, 17 May 2023 13:46:21 +0000 (-0500)
Subject: Return Hardsuits To Lockers (#16490)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f1cd3efcba40994af3c924a6a9801fa46d04e756;p=space-station-14.git

Return Hardsuits To Lockers (#16490)
---

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 772c7013f2..fd6c8cda5f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -1,3 +1,22 @@
+- type: entity
+  id: LockerSalvageSpecialistFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerSalvageSpecialist
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitSpatio
+      - id: YellowOxygenTankFilled
+      - id: NitrogenTankFilled
+      - id: ClothingShoesBootsMag
+      - id: ClothingMaskGasExplorer
+# Currently do not function as 'true' mesons, so they're useless for salvagers.
+#      - id: ClothingEyesGlassesMeson
+      - id: ClothingBeltUtilityFilled
+        prob: 0.8
+      - id: SurvivalKnife
+      - id: WeaponProtoKineticAccelerator
+
 - type: entity
   id: LockerSalvageSpecialistFilled
   suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 1ac715567a..00c368eb0a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -74,8 +74,8 @@
         prob: 0.5
 
 - type: entity
-  id: LockerAtmosphericsFilled
-  suffix: Filled
+  id: LockerAtmosphericsFilledHardsuit
+  suffix: Filled, Hardsuit
   parent: LockerAtmospherics
   components:
   - type: StorageFill
@@ -91,8 +91,22 @@
       - id: HolofanProjector
 
 - type: entity
-  id: LockerEngineerFilled
+  id: LockerAtmosphericsFilled
   suffix: Filled
+  parent: LockerAtmospherics
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskGasAtmos
+      - id: ClothingOuterSuitAtmosFire
+      - id: ClothingHeadHelmetAtmosFire
+      - id: GasAnalyzer
+      - id: MedkitOxygenFilled
+      - id: HolofanProjector
+
+- type: entity
+  id: LockerEngineerFilledHardsuit
+  suffix: Filled, Hardsuit
   parent: LockerEngineer
   components:
   - type: StorageFill
@@ -104,6 +118,17 @@
       - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
 
+- type: entity
+  id: LockerEngineerFilled
+  suffix: Filled
+  parent: LockerEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingMaskGas
+      - id: trayScanner
+
 - type: entity
   id: ClosetRadiationSuitFilled
   parent: ClosetRadiationSuit
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 3bb14610d9..e34f95b324 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -26,6 +26,40 @@
       - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
 
+- type: entity
+  id: LockerCaptainFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerCaptain
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorCaptainCarapace
+      - id: NukeDisk
+      - id: PinpointerNuclear
+      - id: CaptainIDCard
+      - id: ClothingHeadHatCaptain
+      - id: ClothingNeckCloakCap
+      - id: ClothingHandsGlovesCaptain
+      - id: ClothingOuterHardsuitCap
+      - id: ClothingMaskGasCaptain
+      - id: WeaponDisabler
+      - id: CommsComputerCircuitboard
+      - id: ClothingHeadsetAltCommand
+      - id: SpaceCash1000
+      - id: PlushieNuke
+        prob: 0.1
+      - id: CigarGoldCase
+        prob: 0.25
+      - id: ClothingBeltSheathFilled
+      - id: DoorRemoteCommand
+      - id: ClothingNeckCloakCapFormal
+      - id: ClothingUniformJumpsuitCapFormal
+      - id: ClothingUniformJumpskirtCapFormalDress
+      - id: RubberStampCaptain
+      - id: WeaponAntiqueLaser
+      - id: JetpackCaptainFilled
+      - id: MedalCase
+      
 - type: entity
   id: LockerCaptainFilled
   suffix: Filled
@@ -89,6 +123,31 @@
       - id: ClothingBackpackIan
         prob: 0.5
 
+- type: entity
+  id: LockerChiefEngineerFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerChiefEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitEngineeringWhite
+      - id: ClothingMaskBreath
+      - id: OxygenTankFilled
+      - id: NitrogenTankFilled
+      - id: ClothingNeckCloakCe
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingBeltChiefEngineerFilled
+      - id: ClothingHeadHatBeretEngineering
+      - id: ClothingShoesBootsMagAdv
+      - id: ClothingHandsGlovesColorYellow
+      - id: CigarCase
+        prob: 0.15
+      - id: DoorRemoteEngineering
+      - id: RubberStampCE
+      - id: JetpackVoidFilled
+      - id: ClothingHeadsetAltEngineering
+      - id: BoxEncryptionKeyEngineering
+
 - type: entity
   id: LockerChiefEngineerFilled
   suffix: Filled
@@ -108,6 +167,35 @@
       - id: ClothingHeadsetAltEngineering
       - id: BoxEncryptionKeyEngineering
 
+- type: entity
+  id: LockerChiefMedicalOfficerFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerChiefMedicalOfficer
+  components:
+  - type: StorageFill
+    contents:
+      - id: MedkitFilled
+      - id: ClothingHandsGlovesNitrile
+      #- name: ClothingEyesHudMedical #Removed until working properly
+      - id: ClothingHeadsetAltMedical
+      - id: ClothingCloakCmo
+      - id: ClothingBackpackDuffelSurgeryFilled
+      - id: ClothingOuterCoatLabCmo
+      - id: ClothingMaskSterile
+      - id: ClothingHeadHatBeretCmo
+      - id: ClothingOuterHardsuitMedical
+      - id: DiagnoserMachineCircuitboard
+      - id: VaccinatorMachineCircuitboard
+        prob: 0.25
+      - id: Hypospray
+      - id: HandheldCrewMonitor
+      - id: DoorRemoteMedical
+      - id: RubberStampCMO
+      - id: MedicalTechFabCircuitboard
+      - id: MaterialBiomass
+        amount: 3
+      - id: BoxEncryptionKeyMedical
+
 - type: entity
   id: LockerChiefMedicalOfficerFilled
   suffix: Filled
@@ -136,6 +224,29 @@
         amount: 3
       - id: BoxEncryptionKeyMedical
 
+- type: entity
+  id: LockerResearchDirectorFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerResearchDirector
+  components:
+  - type: StorageFill
+    contents:
+      - id: ResearchComputerCircuitboard
+      - id: ProtolatheMachineCircuitboard
+      - id: CircuitImprinterMachineCircuitboard
+      - id: ClothingNeckCloakRd
+      - id: ClothingHeadsetMedicalScience
+      - id: ClothingOuterHardsuitRd
+      - id: HandTeleporter
+      - id: PlushieSlime
+        prob: 0.1
+      - id: DoorRemoteResearch
+      - id: ClothingHeadHatBeretRND
+      - id: RubberStampRd
+      - id: ClothingHeadsetAltScience
+      - id: BoxEncryptionKeyScience
+      - id: BoxEncryptionKeyRobo
+
 - type: entity
   id: LockerResearchDirectorFilled
   suffix: Filled
@@ -158,6 +269,51 @@
       - id: BoxEncryptionKeyScience
       - id: BoxEncryptionKeyRobo
 
+- type: entity
+  id: LockerHeadOfSecurityFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerHeadOfSecurity
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponDisabler
+      - id: ClothingHeadHatBeretHoS
+      - id: ClothingHeadHatHoshat
+      - id: ClothingNeckCloakHos
+      - id: ClothingOuterCoatHoSTrench
+      - id: ClothingUniformJumpskirtHoSAlt
+      - id: ClothingUniformJumpsuitHoSAlt
+      - id: ClothingUniformJumpsuitHoSBlue
+        prob: 0.5
+      - id: ClothingUniformJumpsuitHoSGrey
+        prob: 0.5
+      - id: ClothingUniformJumpsuitHoSParadeMale
+        prob: 0.1
+      - id: ClothingUniformJumpskirtHoSParadeMale
+        prob: 0.1
+      - id: ClothingOuterHardsuitSecurityRed
+      - id: ClothingMaskGasSwat
+      - id: ClothingShoeSlippersDuck
+        prob: 0.2
+      - id: DrinkVacuumFlask
+        prob: 0.8
+      - id: ClothingBeltSecurityFilled
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingShoesBootsJack
+      - id: CigarGoldCase
+        prob: 0.50
+      - id: PlushieSharkPink
+        prob: 0.1
+      - id: DoorRemoteSecurity
+      - id: ClothingUniformJumpskirtHosFormal
+      - id: ClothingUniformJumpsuitHosFormal
+      - id: RubberStampHos
+      - id: SecurityTechFabCircuitboard
+      - id: JetpackSecurityFilled
+      - id: BoxEncryptionKeySecurity
+      - id: HoloprojectorSecurity
+
 - type: entity
   id: LockerHeadOfSecurityFilled
   suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 07df29b5e1..501df7a607 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -1,3 +1,28 @@
+- type: entity
+  id: LockerWardenFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerWarden
+  components:
+  - type: StorageFill
+    contents:
+      - id: FlashlightSeclite
+      - id: WeaponDisabler
+        prob: 0.3
+      - id: ClothingHeadHatWarden
+      - id: ClothingHeadHatBeretWarden
+      - id: ClothingBeltSecurityFilled
+      - id: Flash
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHandsGlovesCombat
+      - id: ClothingShoesBootsJack
+      - id: ClothingOuterCoatWarden
+      - id: ClothingOuterWinterWarden
+      - id: RubberStampWarden
+      - id: DoorRemoteArmory
+      - id: ClothingOuterHardsuitWarden
+      - id: HoloprojectorSecurity
+
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
@@ -20,7 +45,6 @@
       - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
-      - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
 
 - type: entity