From 8b25a54aba00b6c296f3077e9366bf9f2eb72603 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:12:40 +0300
Subject: [PATCH] Fix EVA suits errors and suit fills (#2216)

* GPS? Magboots

* Fix errors
---
 .../Catalog/Fills/Lockers/cargo.yml           |   2 -
 .../Catalog/Fills/Lockers/engineer.yml        |   2 -
 .../Catalog/Fills/Lockers/heads.yml           |   5 -
 .../Catalog/Fills/Lockers/suit_storage.yml    |  14 ---
 .../_NF/Catalog/Fills/Lockers/medical.yml     |   1 -
 .../Catalog/Fills/Lockers/suit_storage.yml    |  21 +---
 .../StorageFillTemplates/departmental_eva.yml |  29 +----
 .../Clothing/OuterClothing/softsuits.yml      | 105 +-----------------
 8 files changed, 9 insertions(+), 170 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 9e90f0a86a6..d5a6c728261 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -8,7 +8,6 @@
     - id: ClothingOuterHardsuitSpatio
     - id: ClothingMaskGasExplorer
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 - type: entityTable
   id: LockerFillSalvageSpecialist
@@ -17,7 +16,6 @@
     - id: ClothingEyesGlassesMeson # Frontier
     - id: ClothingBeltUtilityEngineering # Frontier: Filled<Engineering
     - id: SurvivalKnife
-    # - id: HandheldGPSBasic # Frontier
     - id: RadioHandheldNF # Frontier - RadioHandheld<RadioHandheldNF
     - id: OreBag # Frontier
     - id: AppraisalTool
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 3c2b1ed01ef..00a314f91a8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -102,7 +102,6 @@
       - id: ClothingHandsGlovesColorYellow # Frontier
       - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 #     - id: RCD # Frontier
 #     - id: RCDAmmo # Frontier
@@ -143,7 +142,6 @@
       - id: ClothingShoesBootsMag
       - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 909a9ee34d7..25d005eb414 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -72,7 +72,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No laser locker, used when the antique laser is placed in the special display crate
 - type: entity
@@ -182,7 +181,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -241,7 +239,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -294,7 +291,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -364,7 +360,6 @@
     - id: JetpackSecurityFilled
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
     - id: ClothingShoesBootsMagCombatFilled # Frontier
 
 # No hardsuit locker
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 76053f93337..146d7a615c7 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -14,7 +14,6 @@
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Basic EVA (Big Ass Helmet)
 - type: entity
@@ -31,7 +30,6 @@
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Emergency EVA
 - type: entity
@@ -47,7 +45,6 @@
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Prisoner EVA
 - type: entity
@@ -78,7 +75,6 @@
         - id: ClothingHeadHelmetSyndicate
         - id: ClothingMaskGasSyndicate
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Pirate EVA
 - type: entity
@@ -95,7 +91,6 @@
         - id: ClothingMaskGas
         - id: JetpackBlackFilled # Frontier
         - id: ClothingShoesBootsMagPirateFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #NTSRA Voidsuit
 - type: entity
@@ -113,7 +108,6 @@
         - id: ClothingHeadHelmetAncient
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #HARDSUITS
 #Basic hardsuit
@@ -130,7 +124,6 @@
         - id: ClothingOuterHardsuitBasic
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Engineering hardsuit
 - type: entity
@@ -147,7 +140,6 @@
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Engineering"]] # Frontier
 
@@ -165,7 +157,6 @@
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Atmospherics"]] # Frontier
 
@@ -183,7 +174,6 @@
         - id: ClothingOuterHardsuitSecurity
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
         - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -254,7 +244,6 @@
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
         - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
@@ -300,7 +289,6 @@
         - id: ClothingShoesBootsMagSyndie
         - id: ClothingMaskGasSyndicate
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Pirate Captain's hardsuit
 - type: entity
@@ -318,7 +306,6 @@
         - id: ClothingNeckCloakPirateCap # Frontier
         - id: JetpackBlackFilled # Frontier
         - id: ClothingShoesBootsMagPirateFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Wizard
 - type: entity
@@ -334,4 +321,3 @@
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
index 22f9d5dc6b8..6d955c834dc 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
@@ -22,7 +22,6 @@
       - id: AirTankFilled #Frontier
       - id: ClothingMaskBreathMedical # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerPsychologistFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 1495f5d65d5..78a61cbf37d 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -190,7 +190,6 @@
         - id: ClothingOuterHardsuitLuxury
         - id: ClothingMaskGasExplorer
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Mining hardsuit
@@ -206,7 +205,6 @@
         - id: ClothingOuterHardsuitSalvage
         - id: ClothingMaskGasExplorer
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Mercenary hardsuit
@@ -221,8 +219,7 @@
         - id: ClothingOuterHardsuitMercenary
         - id: ClothingMaskGasMercenary
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagMercenaryFilled
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -237,8 +234,7 @@
         - id: ClothingOuterHardsuitPrivateSecurity
         - id: ClothingMaskGasSecurity
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagCombat # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagCombat
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -254,8 +250,7 @@
         - id: ClothingOuterHardsuitScaf
         - id: ClothingMaskGasMercenary
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagMercenaryFilled
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -271,7 +266,6 @@
         - id: ClothingOuterHardsuitPilot
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Clown hardsuit
@@ -286,7 +280,6 @@
         - id: ClothingOuterHardsuitClown
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Cadet hardsuit
@@ -301,7 +294,6 @@
         - id: ClothingOuterHardsuitNfsdBronze # Frontier
         - id: ClothingMaskGasNfsd
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -318,7 +310,6 @@
         - id: ClothingOuterHardsuitNfsdSilver # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -335,7 +326,6 @@
         - id: ClothingOuterHardsuitNfsdBrigmedic # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -352,7 +342,6 @@
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -369,7 +358,6 @@
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -386,7 +374,6 @@
         - id: ClothingOuterHardsuitNfsdSheriff # Frontier
         - id: ClothingMaskGasSheriff
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -403,7 +390,6 @@
         - id: ClothingOuterHardsuitNfsdCombat # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -420,7 +406,6 @@
         - id: ClothingOuterHardsuitNfsdCommand # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
index 6f19f46805f..4dadd907a26 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
@@ -10,7 +10,6 @@
     - id: ClothingOuterEVASuitContractor
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -23,7 +22,6 @@
     - id: ClothingOuterEVASuitPilot
     - id: ClothingMaskPilot
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -36,7 +34,6 @@
     - id: ClothingOuterEVASuitSr
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -49,7 +46,6 @@
     - id: ClothingOuterEVASuitCaptain
     - id: ClothingMaskGasCaptain
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -62,7 +58,6 @@
     - id: ClothingOuterEVASuitEngineer
     - id: ClothingMaskGas
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -75,7 +70,6 @@
     - id: ClothingOuterEVASuitAtmosTech
     - id: ClothingMaskGasAtmos
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -88,7 +82,6 @@
     - id: ClothingOuterEVASuitCargo
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -101,7 +94,6 @@
     - id: ClothingOuterEVASuitSalvage
     - id: ClothingMaskGasExplorer
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingShoesBootsMag
 
 - type: entity
@@ -115,7 +107,6 @@
     - id: ClothingOuterEVASuitMedic
     - id: ClothingMaskBreathMedical
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -128,7 +119,6 @@
     - id: ClothingOuterHardsuitVoidParamed
     - id: ClothingMaskBreathMedical
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: FlashlightLantern
 
 - type: entity
@@ -142,7 +132,6 @@
     - id: ClothingOuterEVASuitScientist
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -155,7 +144,6 @@
     - id: ClothingOuterEVASuitJanitor
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -168,7 +156,6 @@
     - id: ClothingOuterEVASuitServiceWorker
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -181,7 +168,6 @@
     - id: ClothingOuterEVASuitChaplain
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: Lantern
 
 - type: entity
@@ -195,7 +181,6 @@
     - id: ClothingOuterEVASuitBoxerRed
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingHandsGlovesBoxingRed
     - id: ShardCrystalRed
 
@@ -210,7 +195,6 @@
     - id: ClothingOuterEVASuitBoxerGreen
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingHandsGlovesBoxingGreen
     - id: ShardCrystalGreen
 
@@ -225,7 +209,6 @@
     - id: ClothingOuterEVASuitBoxerBlue
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingHandsGlovesBoxingBlue
     - id: ShardCrystalBlue
 
@@ -240,7 +223,6 @@
     - id: ClothingOuterEVASuitBoxerYellow
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingHandsGlovesBoxingYellow
     - id: ShardCrystalOrange
 
@@ -255,7 +237,6 @@
     - id: ClothingOuterEVASuitBoxerRandom
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: ClothingHandsGlovesBoxingBlue
     - id: ShardCrystalBlue
 
@@ -270,7 +251,6 @@
     - id: ClothingOuterEVASuitHydro
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -283,7 +263,6 @@
     - id: ClothingOuterEVASuitMailman
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
 
 - type: entity
   abstract: true
@@ -296,7 +275,6 @@
     - id: ClothingOuterEVASuitMercenary
     - id: ClothingMaskGasMercenary
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: FlashlightSeclite
 
 - type: entity
@@ -310,7 +288,6 @@
     - id: ClothingOuterEVASuitPrivateSec
     - id: ClothingMaskGasSecurity
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: FlashlightSeclite
 
 - type: entity
@@ -324,7 +301,6 @@
     - id: ClothingOuterEVASuitNfsd
     - id: ClothingMaskGasNfsd
     - id: JetpackNfsdFilled
-    - id: HandheldGPSBasic
     - id: FlashlightNfsdLite
 
 # Other EVA Suits
@@ -339,7 +315,6 @@
     - id: ClothingOuterEVASuitGoblin
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: Lantern
 
 # Emergency
@@ -354,7 +329,6 @@
     - id: ClothingOuterSuitEmergency
     - id: ClothingMaskBreath
     - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
     - id: FlashlightLantern
 
 # Player factions
@@ -368,5 +342,4 @@
     - id: AirTankFilled
     - id: ClothingOuterEVASuitLvhi
     - id: ClothingMaskBreath
-    - id: JetpackMiniFilled
-    - id: HandheldGPSBasic
+    - id: JetpackMiniFilled
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
index 4c98bea470e..37f8635a0cb 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
@@ -27,6 +27,11 @@
     - HidesHarpyWings
   - type: StaticPrice
     price: 95
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+      storagebase: !type:Container
+        ents: []
 
 # DEPARTMENTAL
 - type: entity
@@ -84,10 +89,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetHydro
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -144,10 +145,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetMailman
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 # COLORED DEPARTMENTAL
 ## CONTRACTORS
@@ -206,10 +203,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetContractor
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## COMMAND
 - type: entity
@@ -267,10 +260,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetSr
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -327,10 +316,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetCaptain
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## ENGINEERING
 - type: entity
@@ -388,10 +373,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetEngineer
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -448,10 +429,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetAtmosTech
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## SUPPLY
 - type: entity
@@ -509,10 +486,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetCargo
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -569,10 +542,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetSalvage
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## MEDICAL
 - type: entity
@@ -630,10 +599,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetMedic
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## SCIENCE
 - type: entity
@@ -691,10 +656,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetScientist
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## SERVICE
 - type: entity
@@ -752,10 +713,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetJanitor
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -812,10 +769,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetServiceWorker
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -872,10 +825,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetChaplain
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## Boxing
 - type: entity
@@ -934,10 +883,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetBoxerRed
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -995,10 +940,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetBoxerGreen
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1056,10 +997,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetBoxerBlue
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1117,10 +1054,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetBoxerYellow
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1180,10 +1113,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetBoxerRandom
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## WILDCARDS
 - type: entity
@@ -1241,10 +1170,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetPilot
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1301,10 +1226,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetMercenary
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1361,10 +1282,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetPrivateSec
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## NFSD
 - type: entity
@@ -1422,10 +1339,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetNfsd
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 ## PLAYER FACTIONS
 - type: entity
@@ -1489,10 +1402,6 @@
         shader: unshaded
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetLvhi
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
   parent: NFClothingOuterEVASuitBase
@@ -1561,7 +1470,3 @@
         color: "#8f1717"
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadEVAHelmetArcadia
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}