From 07d631ff5fe11615f0ef5da3c8103b83c25e0913 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Mon, 13 Nov 2023 00:06:00 +0200
Subject: [PATCH] Lockers Balance - again (#561)

* yep

* QM HardSuit

* Belts2lockers

* RD Changes
---
 .../Prototypes/Catalog/Cargo/cargo_cargo.yml  | 20 +++---
 .../Catalog/Fills/Lockers/cargo.yml           | 17 +++--
 .../Catalog/Fills/Lockers/engineer.yml        | 14 ++++
 .../Catalog/Fills/Lockers/heads.yml           | 68 +++++++++----------
 .../Catalog/Fills/Lockers/medical.yml         | 10 +++
 .../Catalog/Fills/Lockers/security.yml        |  5 ++
 .../Catalog/Fills/Lockers/suit_storage.yml    |  8 ++-
 .../Engineering/atmospheric_technician.yml    |  2 +-
 .../Roles/Jobs/Engineering/chief_engineer.yml |  2 +-
 .../Jobs/Engineering/senior_engineer.yml      |  2 +-
 .../Jobs/Engineering/station_engineer.yml     |  2 +-
 .../Jobs/Engineering/technical_assistant.yml  |  2 +-
 .../_NF/Catalog/Fills/Lockers/heads.yml       | 33 +++++++++
 .../_NF/Catalog/Fills/Lockers/medical.yml     | 25 +++++++
 .../_NF/Catalog/Fills/Lockers/security.yml    |  5 ++
 .../Catalog/Fills/Lockers/suit_storage.yml    | 41 ++++++++---
 Resources/migration.yml                       |  8 ++-
 17 files changed, 195 insertions(+), 69 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
index 7557801c282..571ee1338b4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -1,4 +1,4 @@
-# - type: cargoProduct
+# - type: cargoProduct # Frontier - Cannot be moved off floors
   # id: CargoPallet
   # icon:
     # sprite: Structures/catwalk.rsi
@@ -18,12 +18,12 @@
   category: Cargo
   group: market
 
-- type: cargoProduct
-  id: CargoLuxuryHardsuit
-  icon:
-    sprite: Clothing/Head/Hardsuits/luxury.rsi
-    state: icon
-  product: CrateCargoLuxuryHardsuit
-  cost: 15000
-  category: Cargo
-  group: market
+# - type: cargoProduct # Frontier - Moved to cargo locker
+  # id: CargoLuxuryHardsuit
+  # icon:
+    # sprite: Clothing/Head/Hardsuits/luxury.rsi
+    # state: icon
+  # product: CrateCargoLuxuryHardsuit
+  # cost: 15000
+  # category: Cargo
+  # group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index e7ba13ecec3..9fdf7332b9a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -15,11 +15,15 @@
 #      - id: ClothingBeltUtilityFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
       - id: SurvivalKnife
-#      - id: HandheldGPSBasic # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
-      - id: Flare
-        amount: 3
+#      - id: Flare # Frontier
+#        amount: 3 # Frontier
+      - id: BoxFlare # Frontier
+      - id: MiningDrill # Frontier
+      - id: WeaponProtoKineticAccelerator # Frontier
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -36,5 +40,8 @@
 #      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
-      - id: Flare
-        amount: 3
+#      - id: Flare # Frontier
+#        amount: 3 # Frontier
+      - id: BoxFlare # Frontier
+      - id: MiningDrill # Frontier
+      - id: WeaponProtoKineticAccelerator # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 1f7ee7efc71..ffb0eb6c62b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,12 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
 #      - id: DoorRemoteFirefight
+      - id: ClothingShoesBootsMag # Frontier
+      - id: ClothingHandsGlovesColorYellow # Frontier
+      - id: trayScanner # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerAtmosphericsFilled
@@ -105,6 +111,9 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
 #      - id: DoorRemoteFirefight
+      - id: ClothingHandsGlovesColorYellow # Frontier
+      - id: trayScanner # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerEngineerFilledHardsuit
@@ -119,6 +128,10 @@
       - id: OxygenTankFilled
       - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
+      - id: trayScanner # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerEngineerFilled
@@ -130,6 +143,7 @@
       - id: ClothingHandsGlovesColorYellow
       - id: ClothingMaskGas
       - id: trayScanner
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: ClosetRadiationSuitFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 723c63a1514..bbc173e519c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -66,6 +66,8 @@
       - id: DrinkFlask # Frontier
       - id: OxygenTankFilled # Frontier
       - id: NitrogenTankFilled # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerCaptainFilled
@@ -171,6 +173,8 @@
       - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
       - id: ClothingNeckMantleCE # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -222,7 +226,14 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
       - id: ClothingNeckMantleCMO # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskBreathMedical # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -250,6 +261,8 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
       - id: ClothingNeckMantleCMO # Frontier
       - id: ClothingOuterWinterCMO # Frontier
 
@@ -260,11 +273,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
+#      - id: ResearchComputerCircuitboard # Frontier
+#      - id: ProtolatheMachineCircuitboard # Frontier
+#      - id: CircuitImprinterMachineCircuitboard # Frontier
       - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
+#      - id: ClothingHeadsetMedicalScience # Frontier
       - id: ClothingOuterHardsuitRd
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
@@ -273,34 +286,14 @@
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo
+#      - id: BoxEncryptionKeyRobo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingNeckMantleRD # Frontier
-
-- type: entity
-  id: LockerResearchDirectorShuttleFilled
-  suffix: Filled, Shuttle
-  parent: LockerResearchDirector
-  components:
-  - type: StorageFill
-    contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
-      - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
-      - id: PlushieSlime
-        prob: 0.1
-#      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityEngineering # Frontier
-      - id: RubberStampRd
-      - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo # Frontier
-      - id: ClothingNeckMantleRD # Frontier
-      - id: ClothingOuterWinterRD # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskBreath # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -309,20 +302,19 @@
   components:
   - type: StorageFill
     contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
+#      - id: ResearchComputerCircuitboard # Frontier
+#      - id: ProtolatheMachineCircuitboard # Frontier
+#      - id: CircuitImprinterMachineCircuitboard # Frontier
       - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
+#      - id: ClothingHeadsetMedicalScience # Frontier
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityEngineering # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingNeckMantleRD # Frontier
       - id: ClothingOuterWinterRD # Frontier
 
@@ -359,6 +351,10 @@
       - id: HoloprojectorSecurity
       - id: ClothingNeckMantleHOS # Frontier
       - id: CrowbarRed # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: JetpackSecurityFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index a2711ec1586..063256879ea 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -68,6 +68,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
 
 - type: entity
   parent: LockerWallMedical
@@ -102,6 +104,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
 
 - type: entity
   id: LockerChemistryFilled
@@ -120,6 +124,10 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: HandLabeler
+      - id: ClothingBeltMedical # Frontier
+      - id: ClothingEyesGlassesChemical # Frontier
+      - id: SheetPlasma1 # Frontier
+        amount: 3
 
 - type: entity
   id: LockerParamedicFilled
@@ -139,3 +147,5 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: MedkitFilled
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index f7179a90f15..cfe9d42f6d1 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -23,6 +23,11 @@
       - id: HoloprojectorSecurity
       - id: ClothingEyesHudSecurity
       - id: CrowbarRed # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskGasSecurity # Frontier
+      - id: JetpackSecurityFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerWardenFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 7428f8141a8..006320a878c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -174,6 +174,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 
@@ -245,6 +246,7 @@
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["HeadOfSecurity"]]
 
@@ -262,6 +264,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
 
@@ -277,7 +280,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
-        - id: JetpackCaptainFilled # Frontier
+        - id: JetpackMiniFilled # Frontier
         - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Captain"]] # Frontier
@@ -328,8 +331,11 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateCap
         - id: ClothingMaskGas
+        - id: ClothingNeckCloakPirateCap # Frontier
         - id: JetpackBlackFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+        - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagPirateFilled # Frontier - TODO: Add this ones its ready
 
 #Wizard
 - type: entity
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index 945af9e9386..6cb48223470 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -23,7 +23,7 @@
     shoes: ClothingShoesColorWhite
     eyes: ClothingEyesGlassesMeson
     id: AtmosPDA
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtAtmos
   satchel: ClothingBackpackSatchelAtmosphericsFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index ec468298a11..cea5f65aef4 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -36,7 +36,7 @@
     id: CEPDA
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
   innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
   satchel: ClothingBackpackSatchelChiefEngineerFilled
   duffelbag: ClothingBackpackDuffelChiefEngineerFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
index fe0ef2e2d5f..c77338cef68 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -31,7 +31,7 @@
     shoes: ClothingShoesBootsWork
     id: SeniorEngineerPDA
     eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
   satchel: ClothingBackpackSatchelEngineeringFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index f9e60108508..649a0b970ba 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -26,7 +26,7 @@
     outerClothing: ClothingOuterVestHazard
     id: EngineerPDA
     eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtEngineering
   satchel: ClothingBackpackSatchelEngineeringFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index 4a8e91eb173..1a4f126c5a9 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -25,7 +25,7 @@
     back: ClothingBackpackEngineeringFilled
     shoes: ClothingShoesBootsWork
     id: TechnicalAssistantPDA
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtColorYellow
   satchel: ClothingBackpackSatchelEngineeringFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
new file mode 100644
index 00000000000..8defeded8bd
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
@@ -0,0 +1,33 @@
+- type: entity
+  id: LockerQuarterMasterFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerQuarterMaster
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingNeckCloakQm
+#      - id: BoxFolderQmClipboard # Frontier - Moved to SR backpack
+      - id: ClothingHeadsetCargo
+      - id: ClothingUniformJumpsuitQMTurtleneck
+      - id: ClothingUniformJumpskirtQMTurtleneck
+      - id: ClothingHandsGlovesColorBrown
+      - id: ClothingShoesColorBrown
+      - id: ClothingHeadHatQMsoft
+#      - id: CargoRequestComputerCircuitboard # Frontier
+#      - id: CargoShuttleComputerCircuitboard # Frontier
+#      - id: CargoShuttleConsoleCircuitboard # Frontier
+#      - id: SalvageShuttleConsoleCircuitboard # Frontier
+#      - id: CargoBountyComputerCircuitboard # Frontier
+      - id: CigPackGreen
+        prob: 0.50
+#      - id: DoorRemoteCargo # Frontier
+      - id: RubberStampQm
+      - id: ClothingHeadsetAltCargo
+      - id: BoxEncryptionKeyCargo
+      - id: ClothingNeckMantleQM # Frontier
+      - id: ClothingOuterWinterQM # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: ClothingMaskGasExplorer # Frontier
+      - id: ClothingOuterHardsuitLuxury # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
new file mode 100644
index 00000000000..7d9c2ffc396
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
@@ -0,0 +1,25 @@
+- type: entity
+  id: LockerParamedicFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerParamedic
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetVoidParamed
+      - id: ClothingOuterHardsuitVoidParamed
+      - id: ClothingOuterCoatParamedicWB
+      - id: ClothingHeadHatParamedicsoft
+      - id: ClothingUniformJumpsuitParamedic
+      - id: ClothingUniformJumpskirtParamedic
+      - id: ClothingEyesHudMedical
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetMedical
+      - id: ClothingMaskSterile
+      - id: MedkitFilled
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskBreathMedical # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
index a64c01a8b4e..b21fb645e28 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
@@ -31,6 +31,11 @@
       - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
         prob: 0.15
       - id: CrowbarRed # Frontier
+      - id: NitrogenTankFilled
+      - id: OxygenTankFilled
+      - id: ClothingMaskBreathMedicalSecurity
+      - id: JetpackSecurityFilled
+      - id: HandheldGPSBasic
 
 - type: entity
   id: LockerBrigmedicFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 3d0b3690546..d2842ee582a 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -1,3 +1,22 @@
+#SOFTSUITS
+#Paramedic's hardsuit
+- type: entity
+  id: SuitStorageParamedic
+  parent: SuitStorageBase
+  suffix: Paramedic
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingHeadHelmetVoidParamed
+        - id: ClothingOuterHardsuitVoidParamed
+        - id: ClothingMaskBreathMedical
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+  - type: AccessReader
+#    access: [["Medical"]]
+
 #HARDSUITS
 #Brigmedic's hardsuit
 - type: entity
@@ -13,22 +32,24 @@
         - id: ClothingMaskBreathMedicalSecurity
         - id: JetpackSecurityFilled
         - id: HandheldGPSBasic
+#        - id: ClothingShoesBootsMagCombatFilled
   - type: AccessReader
     access: [["Security"]]
 
-#Paramedic's hardsuit
+#Quartermaster hardsuit
 - type: entity
-  id: SuitStorageParamedic
+  id: SuitStorageQuartermaster
   parent: SuitStorageBase
-  suffix: Paramedic
+  suffix: Quartermaster
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
-        - id: ClothingHeadHelmetVoidParamed
-        - id: ClothingOuterHardsuitVoidParamed
-        - id: ClothingMaskBreathMedical
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
+      - id: NitrogenTankFilled
+      - id: YellowOxygenTankFilled
+      - id: ClothingShoesBootsMag
+      - id: ClothingOuterHardsuitLuxury
+      - id: ClothingMaskGasExplorer
+      - id: JetpackMiniFilled
+      - id: HandheldGPSBasic
   - type: AccessReader
+    # access: [["Quartermaster"]]
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 4a0bc18d2f4..6c2fb582151 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -156,10 +156,14 @@ GeneratorUranium: PortableGeneratorSuperPacman
 GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard
 GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard
 
-# 2023-10-09
+# 2023-09-10
 ClothingUniformMailCarrier: ClothingUniformJumpsuitMailCarrier
 ClothingUniformSkirtMailCarrier: ClothingUniformJumpskirtMailCarrier
 
-# 2023-12-09
+# 2023-09-12
 # EMP Immune moved to grid based.
 APCBasicEmpImmune: APCBasic
+
+# 2023-11-11
+# No need for a copy paste of the locker
+LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled
\ No newline at end of file