diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 60edbcf9246..162509769ba 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -52,9 +52,10 @@
       - id: PestSpray
       - id: HydroponicsToolScythe
       - id: HydroponicsToolHatchet
-      - id: ClothingOuterApronBotanist
-      - id: ClothingHandsGlovesLeather
-      - id: HydroponicsToolClippers
+#      - id: ClothingOuterApronBotanist # Frontier
+#      - id: ClothingHandsGlovesLeather # Frontier
+      - id: HydroponicsToolClippers # Frontier
+      - id: HydroponicsToolSpade # Frontier
 
 - type: entity
   id: CrateHydroponicsSeeds
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 32fc09d298e..fc7371789a4 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -114,6 +114,8 @@
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
     - id: RobustHarvestChemistryBottle
+    - id: HydroponicsToolClippers # Frontier
+    - id: EZNutrientChemistryBottle # Frontier
 
 - type: entity
   id: ClothingBeltSheathFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index f0a5c6b81a3..e2394a86f9f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -5,27 +5,27 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakQm
+#      - id: ClothingNeckCloakQm
 #      - id: BoxFolderQmClipboard # Frontier - Moved to SR backpack
-      - id: ClothingHeadsetCargo
-      - id: ClothingUniformJumpsuitQMTurtleneck
-      - id: ClothingUniformJumpskirtQMTurtleneck
-      - id: ClothingHandsGlovesColorBrown
-      - id: ClothingShoesColorBrown
-      - id: ClothingHeadHatQMsoft
+#      - id: ClothingHeadsetCargo # Frontier
+#      - id: ClothingUniformJumpsuitQMTurtleneck # Frontier
+#      - id: ClothingUniformJumpskirtQMTurtleneck # Frontier
+#      - id: ClothingHandsGlovesColorBrown # Frontier
+#      - id: ClothingShoesColorBrown # Frontier
+#      - id: ClothingHeadHatQMsoft # Frontier
 #      - id: CargoRequestComputerCircuitboard # Frontier
 #      - id: CargoShuttleComputerCircuitboard # Frontier
 #      - id: CargoShuttleConsoleCircuitboard # Frontier
 #      - id: SalvageShuttleConsoleCircuitboard # Frontier
 #      - id: CargoBountyComputerCircuitboard # Frontier
-      - id: CigPackGreen
-        prob: 0.50
+#      - id: CigPackGreen # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteCargo # Frontier
       - id: RubberStampQm
       - id: ClothingHeadsetAltCargo
-      - id: BoxEncryptionKeyCargo
-      - id: ClothingNeckMantleQM # Frontier
-      - id: ClothingOuterWinterQM # Frontier
+#      - id: BoxEncryptionKeyCargo
+#      - id: ClothingNeckMantleQM # Frontier
+#      - id: ClothingOuterWinterQM # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
@@ -48,10 +48,10 @@
 #      - id: CommsComputerCircuitboard # Frontier
 #      - id: ClothingHeadsetAltCommand # Frontier
 #      - id: SpaceCash1000 # Frontier
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: PlushieNuke # Frontier
+#        prob: 0.1
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.25
 #      - id: ClothingBeltSheathFilled # Frontier
 #      - id: DoorRemoteCommand # Frontier
       - id: ClothingNeckCloakCapFormal
@@ -87,10 +87,10 @@
 #      - id: CommsComputerCircuitboard # Frontier
 #      - id: ClothingHeadsetAltCommand # Frontier
 #      - id: SpaceCash1000 # Frontier
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: PlushieNuke # Frontier
+#        prob: 0.1
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.25
 #      - id: ClothingBeltSheathFilled # Frontier
 #      - id: DoorRemoteCommand # Frontier
       - id: ClothingNeckCloakCapFormal
@@ -111,28 +111,28 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakHop
-      - id: ClothingHeadHatHopcap
+#      - id: ClothingNeckCloakHop # Frontier - bloat
+#      - id: ClothingHeadHatHopcap # Frontier - bloat
       - id: HoPIDCard
 #      - id: ClothingHeadsetCommand # Frontier
       - id: ClothingHeadsetCentCom # Frontier
-      - id: BoxPDA
-      - id: BoxID
-      - id: BoxHeadset
+#      - id: BoxPDA # Frontier - bloat
+#      - id: BoxID # Frontier - bloat
+#      - id: BoxHeadset # Frontier - bloat
       - id: BoxHandcuff # Frontier
       - id: IDComputerCircuitboard
       - id: CommsComputerCircuitboard # Frontier
-      - id: WeaponDisabler
-      - id: ClothingOuterWinterHoP
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: WeaponDisabler # Frontier - bloat
+#      - id: ClothingOuterWinterHoP # Frontier - bloat
+#      - id: CigarGoldCase  # Frontier
+#        prob: 0.25
         # Fuck the HoP they don't deserve fucking cigars.
         # Yes they do fuck you.
 #      - id: DoorRemoteService # Frontier
 #      - id: ClothingNeckGoldmedal # Frontier
 #      - id: RubberStampHop # Frontier
-      - id: BoxEncryptionKeyPassenger
-      - id: BoxEncryptionKeyService
+#      - id: BoxEncryptionKeyPassenger # Frontier - bloat
+#      - id: BoxEncryptionKeyService # Frontier - bloat
       - id: ClothingBackpackIan
 #        prob: 0.5 # Frontier
 #      - id: AccessConfigurator # Frontier
@@ -152,27 +152,27 @@
     contents:
       - id: ClothingOuterHardsuitEngineeringWhite
       - id: ClothingMaskBreath
-      - id: ClothingUniformJumpsuitChiefEngineerTurtle
-      - id: ClothingUniformJumpskirtChiefEngineerTurtle
+#      - id: ClothingUniformJumpsuitChiefEngineerTurtle
+#      - id: ClothingUniformJumpskirtChiefEngineerTurtle
       - id: OxygenTankFilled
       - id: NitrogenTankFilled
-      - id: ClothingNeckCloakCe
+#      - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
 #      - id: ClothingBeltChiefEngineerFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingHeadHatBeretEngineering
+#      - id: ClothingHeadHatBeretEngineering
 #      - id: ClothingShoesBootsMagAdv # Frontier
       - id: ClothingShoesBootsMag # Frontier
       - id: ClothingHandsGlovesColorYellow
-      - id: CigarCase
-        prob: 0.15
+#      - id: CigarCase # Frontier
+#        prob: 0.15
 #      - id: DoorRemoteEngineering # Frontier
       - id: RubberStampCE
 #      - id: JetpackVoidFilled # Frontier
       - id: ClothingHeadsetAltEngineering
-      - id: BoxEncryptionKeyEngineering
+#      - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
-      - id: ClothingNeckMantleCE # Frontier
+      - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
 
@@ -183,23 +183,22 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakCe
+#      - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
 #      - id: ClothingBeltChiefEngineerFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingHeadHatBeretEngineering
+#      - id: ClothingHeadHatBeretEngineering
       - id: ClothingHandsGlovesColorYellow
-      - id: ClothingUniformJumpsuitChiefEngineerTurtle
-      - id: ClothingUniformJumpskirtChiefEngineerTurtle
-      - id: CigarCase
-        prob: 0.15
+#      - id: ClothingUniformJumpsuitChiefEngineerTurtle
+#      - id: ClothingUniformJumpskirtChiefEngineerTurtle
+#      - id: CigarCase # Frontier
+#        prob: 0.15
 #      - id: DoorRemoteEngineering # Frontier
       - id: RubberStampCE
       - id: ClothingHeadsetAltEngineering
-      - id: BoxEncryptionKeyEngineering
+#      - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
-      - id: ClothingNeckMantleCE # Frontier
-      - id: ClothingOuterWinterCE # Frontier
+      - id: trayScanner # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -208,27 +207,24 @@
   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: MedkitFilled # Frontier - bloat
+#      - id: ClothingHandsGlovesNitrile # Frontier - bloat
+      - id: ClothingEyesHudMedical # Frontier
+      - id: ClothingHeadsetAltMedical # Frontier - bloat
+#      - id: ClothingCloakCmo # Frontier - bloat
+#      - id: ClothingBackpackDuffelSurgeryFilled # Frontier - bloat
+#      - id: ClothingOuterCoatLabCmo # Frontier - bloat
+#      - id: ClothingMaskSterile # Frontier - bloat
+#      - id: ClothingHeadHatBeretCmo # Frontier - bloat
       - id: ClothingOuterHardsuitMedical
       - id: Hypospray
       - id: HandheldCrewMonitor
 #      - id: DoorRemoteMedical # Frontier
       - id: RubberStampCMO
-      - id: MedicalTechFabCircuitboard
+#      - id: MedicalTechFabCircuitboard # Frontier - bloat
       - id: MaterialBiomass
-        amount: 3
-      - id: BoxEncryptionKeyMedical
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
-      - id: ClothingNeckMantleCMO # Frontier
+        amount: 1 # Frontier - 3<1
+#      - id: BoxEncryptionKeyMedical # Frontier - bloat
       - id: NitrogenTankFilled # Frontier
       - id: OxygenTankFilled # Frontier
       - id: ClothingMaskBreathMedical # Frontier
@@ -242,29 +238,25 @@
   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: DiagnoserMachineCircuitboard
-      - id: VaccinatorMachineCircuitboard
+#      - id: MedkitFilled # Frontier - bloat
+#      - id: ClothingHandsGlovesNitrile # Frontier - bloat
+      - id: ClothingEyesHudMedical # Frontier
+      - id: ClothingHeadsetAltMedical # Frontier - bloat
+#      - id: ClothingCloakCmo # Frontier - bloat
+#      - id: ClothingBackpackDuffelSurgeryFilled # Frontier - bloat
+#      - id: ClothingOuterCoatLabCmo # Frontier - bloat
+#      - id: ClothingMaskSterile # Frontier - bloat
+#      - id: ClothingHeadHatBeretCmo # Frontier - bloat
+#      - id: DiagnoserMachineCircuitboard # Frontier - bloat
+#      - id: VaccinatorMachineCircuitboard # Frontier - bloat
       - id: Hypospray
       - id: HandheldCrewMonitor
 #      - id: DoorRemoteMedical # Frontier
       - id: RubberStampCMO
-      - id: MedicalTechFabCircuitboard
+#      - id: MedicalTechFabCircuitboard # Frontier - bloat
       - id: MaterialBiomass
-        amount: 3
-      - id: BoxEncryptionKeyMedical
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
-      - id: ClothingNeckMantleCMO # Frontier
-      - id: ClothingOuterWinterCMO # Frontier
+        amount: 1 # Frontier - 3<1
+#      - id: BoxEncryptionKeyMedical # Frontier - bloat
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -276,19 +268,17 @@
 #      - id: ResearchComputerCircuitboard # Frontier
 #      - id: ProtolatheMachineCircuitboard # Frontier
 #      - id: CircuitImprinterMachineCircuitboard # Frontier
-      - id: ClothingNeckCloakRd
+#      - id: ClothingNeckCloakRd # Frontier
 #      - id: ClothingHeadsetMedicalScience # Frontier
       - id: ClothingOuterHardsuitRd
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple # Frontier
+#      - id: ClothingHeadHatBeretRND # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
+#      - id: BoxEncryptionKeyScience
 #      - id: BoxEncryptionKeyRobo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingNeckMantleRD # Frontier
       - id: NitrogenTankFilled # Frontier
       - id: OxygenTankFilled # Frontier
       - id: ClothingMaskBreath # Frontier
@@ -305,18 +295,16 @@
 #      - id: ResearchComputerCircuitboard # Frontier
 #      - id: ProtolatheMachineCircuitboard # Frontier
 #      - id: CircuitImprinterMachineCircuitboard # Frontier
-      - id: ClothingNeckCloakRd
+#      - id: ClothingNeckCloakRd # Frontier
 #      - id: ClothingHeadsetMedicalScience # Frontier
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple
+#      - id: ClothingHeadHatBeretRND # Frontier
+#      - id: ClothingHandsGlovesColorPurple # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
+#      - id: BoxEncryptionKeyScience # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingNeckMantleRD # Frontier
-      - id: ClothingOuterWinterRD # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
@@ -339,8 +327,8 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteSecurity # Frontier
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
@@ -376,8 +364,8 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteSecurity # Frontier
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 063256879ea..c5d4b3841ed 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -35,7 +35,6 @@
         amount: 2
       - id: Gauze
 
-
 - type: entity
   id: LockerMedicalFilled
   suffix: Filled
@@ -44,32 +43,32 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        prob: 0.6
+#        prob: 0.6
       - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetMedical
-     # - id: ClothingEyesHudMedical #Removed until working properly
-      - id: ClothingBeltMedical
-      - id: ClothingHeadHatSurgcapGreen
-        prob: 0.1
-        orGroup: Surgcaps
-      - id: ClothingHeadHatSurgcapPurple
-        prob: 0.05
-        orGroup: Surgcaps
-      - id: ClothingHeadHatSurgcapBlue
-        prob: 0.90
-        orGroup: Surgcaps
-      - id: UniformScrubsColorBlue
-        prob: 0.5
-        orGroup: Surgshrubs
-      - id: UniformScrubsColorGreen
-        prob: 0.1
-        orGroup: Surgshrubs
-      - id: UniformScrubsColorPurple
-        prob: 0.05
-        orGroup: Surgshrubs
+#      - id: ClothingHeadsetMedical # Frontier
+      - id: ClothingEyesHudMedical # Frontier
+#      - id: ClothingBeltMedical
+#      - id: ClothingHeadHatSurgcapGreen
+#        prob: 0.1
+#        orGroup: Surgcaps
+#      - id: ClothingHeadHatSurgcapPurple
+#        prob: 0.05
+#        orGroup: Surgcaps
+#      - id: ClothingHeadHatSurgcapBlue
+#        prob: 0.90
+#        orGroup: Surgcaps
+#      - id: UniformScrubsColorBlue
+#        prob: 0.5
+#        orGroup: Surgshrubs
+#      - id: UniformScrubsColorGreen
+#        prob: 0.1
+#        orGroup: Surgshrubs
+#      - id: UniformScrubsColorPurple
+#        prob: 0.05
+#        orGroup: Surgshrubs
       - id: ClothingMaskSterile
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
+#      - id: ClothingBeltMedical # Frontier
+      - id: ClothingBeltMedicalFilled # Frontier
 
 - type: entity
   parent: LockerWallMedical
@@ -80,32 +79,31 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        prob: 0.6
+#        prob: 0.6
       - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetMedical
-     # - id: ClothingEyesHudMedical #Removed until working properly
-      - id: ClothingBeltMedical
-      - id: ClothingHeadHatSurgcapGreen
-        prob: 0.1
-        orGroup: Surgcaps
-      - id: ClothingHeadHatSurgcapPurple
-        prob: 0.05
-        orGroup: Surgcaps
-      - id: ClothingHeadHatSurgcapBlue
-        prob: 0.90
-        orGroup: Surgcaps
-      - id: UniformScrubsColorBlue
-        prob: 0.5
-        orGroup: Surgshrubs
-      - id: UniformScrubsColorGreen
-        prob: 0.1
-        orGroup: Surgshrubs
-      - id: UniformScrubsColorPurple
-        prob: 0.05
-        orGroup: Surgshrubs
+#      - id: ClothingHeadsetMedical # Frontier
+      - id: ClothingEyesHudMedical # Frontier
+#      - id: ClothingBeltMedical
+#      - id: ClothingHeadHatSurgcapGreen
+#        prob: 0.1
+#        orGroup: Surgcaps
+#      - id: ClothingHeadHatSurgcapPurple
+#        prob: 0.05
+#        orGroup: Surgcaps
+#      - id: ClothingHeadHatSurgcapBlue
+#        prob: 0.90
+#        orGroup: Surgcaps
+#      - id: UniformScrubsColorBlue
+#        prob: 0.5
+#        orGroup: Surgshrubs
+#      - id: UniformScrubsColorGreen
+#        prob: 0.1
+#        orGroup: Surgshrubs
+#      - id: UniformScrubsColorPurple
+#        prob: 0.05
+#        orGroup: Surgshrubs
       - id: ClothingMaskSterile
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
+      - id: ClothingBeltMedicalFilled # Frontier
 
 - type: entity
   id: LockerChemistryFilled
@@ -121,10 +119,9 @@
       - id: BoxBottle
       - id: ChemBag
       - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetMedical
+#      - id: ClothingHeadsetMedical # Frontier
       - id: ClothingMaskSterile
-      - id: HandLabeler
-      - id: ClothingBeltMedical # Frontier
+#      - id: HandLabeler
       - id: ClothingEyesGlassesChemical # Frontier
       - id: SheetPlasma1 # Frontier
         amount: 3
@@ -138,14 +135,13 @@
     contents:
 #      - id: ClothingHeadHelmetVoidParamed # Frontier
 #      - id: ClothingOuterHardsuitVoidParamed # Frontier
-      - id: ClothingOuterCoatParamedicWB
-      - id: ClothingHeadHatParamedicsoft
-      - id: ClothingUniformJumpsuitParamedic
-      - id: ClothingUniformJumpskirtParamedic
+#      - id: ClothingOuterCoatParamedicWB # Frontier
+#      - id: ClothingHeadHatParamedicsoft # Frontier
+#      - id: ClothingUniformJumpsuitParamedic # Frontier
+#      - id: ClothingUniformJumpskirtParamedic # Frontier
       - id: ClothingEyesHudMedical
       - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetMedical
+#      - id: ClothingHeadsetMedical  # Frontier
       - id: ClothingMaskSterile
-      - id: MedkitFilled
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
+      - id: ClothingBeltParamedicFilled # Frontier
+      - id: MedkitFilled # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
index 237185dd15a..f91e2490cdf 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
@@ -5,10 +5,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetScience
-      - id: ClothingMaskSterile
-      - id: ClothingOuterCoatRnd
+#      - id: ClothingHandsGlovesLatex # Frontier
+#      - id: ClothingHeadsetScience # Frontier
+#      - id: ClothingMaskSterile # Frontier
+#      - id: ClothingOuterCoatRnd # Frontier
       - id: AnomalyScanner
       - id: NodeScanner
-      - id: NetworkConfigurator
+#      - id: NetworkConfigurator # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 23b182148c0..55fac8ce52b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -91,20 +91,22 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHandsGlovesLeather
-      - id: ClothingOuterApronBotanist
-      - id: ClothingHeadBandBotany
-      - id: HydroponicsToolClippers
-      - id: HydroponicsToolSpade
-      - id: HydroponicsToolMiniHoe
-      - id: RobustHarvestChemistryBottle
-      - id: ClothingBeltPlant
+#      - id: ClothingHandsGlovesLeather # Frontier
+#      - id: ClothingOuterApronBotanist # Frontier
+#      - id: ClothingHeadBandBotany # Frontier
+#      - id: HydroponicsToolClippers # Frontier
+#      - id: HydroponicsToolSpade # Frontier
+#      - id: HydroponicsToolMiniHoe # Frontier
+#      - id: RobustHarvestChemistryBottle # Frontier
+#      - id: ClothingBeltPlant # Frontier
+      - id: ClothingBeltPlantFilled # Frontier
       - id: PlantBag ##Some maps don't have nutrivend
       - id: BoxMouthSwab
-      - id: HandLabeler
-      - id: ClothingUniformOveralls
-      - id: ClothingHeadHatTrucker
-        prob: 0.1
+#      - id: HandLabeler
+#      - id: ClothingUniformOveralls # Frontier
+#      - id: ClothingHeadHatTrucker # Frontier
+#        prob: 0.1
+      - id: ClothingHeadsetService # Frontier
 
 - type: entity
   id: LockerBotanistLoot
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
index 927eaae5e4d..a199134eff8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -11,6 +11,29 @@
     ClothingHeadHatCargosoft: 3
     ClothingHeadBandBrown: 3
     ClothingHeadsetCargo: 3
+    EncryptionKeyCargo: 10
     ClothingOuterWinterCargo: 2
-    ClothingOuterWinterMiner: 2
     ClothingNeckScarfStripedBrown: 3
+# Salvage:
+    ClothingBackpackSalvage: 2
+    ClothingBackpackSatchelSalvage: 2
+    ClothingBackpackDuffelSalvage: 2
+    ClothingBeltSalvageWebbing: 2
+    ClothingUniformJumpsuitSalvageSpecialist: 2
+    ClothingOuterWinterMiner: 2
+    ClothingHeadsetMining: 2
+    ClothingNeckCloakMiner: 2
+# QM:
+    ClothingUniformJumpsuitQMTurtleneck: 1
+    ClothingUniformJumpskirtQMTurtleneck: 1
+    ClothingOuterWinterQM: 1
+    ClothingNeckCloakQm: 1
+    ClothingNeckMantleQM: 1
+    ClothingHeadHatQMsoft: 1
+    ClothingHandsGlovesColorBrown: 1
+    ClothingHeadsetAltCargo: 1
+    RubberStampQm: 1
+  contrabandInventory: # Frontier - Hidden inventory
+    ClothingHeadHatCargosoftFlipped: 1
+    ClothingNeckCloakHerald: 1
+    ClothingNeckCloakGoliathCloak: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index c90a5bce143..d4ddf07eda7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -16,6 +16,7 @@
     ClothingOuterPlagueSuit: 1
     ClothingMaskPlague: 1
     ClothingHeadsetService: 2
+    RubberStampChaplain: 1
   emaggedInventory:
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
index da5ce32d216..7a3e2e4aa98 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -10,3 +10,4 @@
     ClothingUniformJumpskirtChef:  2
     ClothingHeadHatChef: 2
     ClothingShoesColorBlack: 2
+    ClothingShoesChef: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
index 03a39c979b3..63aa68dfbef 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -13,5 +13,35 @@
     ClothingHeadHatHardhatYellow: 3
     ClothingHeadHatHardhatOrange: 3
     ClothingHeadsetEngineering: 3
+    EncryptionKeyEngineering: 10
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
+# Atmost:
+    ClothingBackpackDuffelAtmospherics: 2
+    ClothingBackpackSatchelAtmospherics: 2
+    ClothingBackpackAtmospherics: 2
+    ClothingUniformJumpsuitAtmos: 3
+    ClothingUniformJumpskirtAtmos: 3
+    ClothingUniformJumpsuitAtmosCasual: 3
+    ClothingShoesColorWhite: 3
+    ClothingHeadHelmetFire: 2
+    ClothingOuterSuitFire: 2
+    ClothingOuterWinterAtmos: 2
+    ClothingNeckScarfStripedLightBlue: 3
+# Senior:
+    ClothingUniformJumpsuitSeniorEngineer: 1
+    ClothingUniformJumpskirtSeniorEngineer: 1
+# CE:
+    ClothingUniformJumpsuitChiefEngineerNT: 1
+    ClothingUniformJumpsuitChiefEngineer: 1
+    ClothingUniformJumpskirtChiefEngineer: 1
+    ClothingUniformJumpsuitChiefEngineerTurtle: 1
+    ClothingUniformJumpskirtChiefEngineerTurtle: 1
+    ClothingOuterWinterCE: 1
+    ClothingHeadHatBeretEngineering: 1
+    ClothingNeckCloakCe: 1
+    ClothingNeckMantleCE: 1
+    ClothingHeadsetAltEngineering: 1
+    RubberStampCE: 1
+  emaggedInventory:
+    ClothingUniformJumpsuitChiefEngineerSyndie: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
index 5e1833f0b52..272dc9a31e5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -1,13 +1,17 @@
 - type: vendingMachineInventory
   id: HyDrobeInventory
   startingInventory:
-    ClothingBackpackHydroponics: 2
-    ClothingBackpackSatchelHydroponics: 2
-    ClothingBackpackDuffelHydroponics: 2
-    ClothingOuterApronBotanist: 2
+    ClothingBackpackHydroponics: 3
+    ClothingBackpackSatchelHydroponics: 3
+    ClothingBackpackDuffelHydroponics: 3
+    ClothingBeltPlant: 3 # Frontier
+    ClothingOuterApronBotanist: 3
     ClothingUniformOveralls: 3
     ClothingUniformJumpsuitHydroponics: 3
     ClothingUniformJumpskirtHydroponics: 3
     ClothingHeadBandBotany: 3
-    ClothingHeadsetService: 2
-    ClothingOuterWinterHydro: 2
+    ClothingHeadHatTrucker: 3 # Frontier
+    ClothingHeadsetService: 3
+    ClothingOuterWinterHydro: 3
+    ClothingHandsGlovesLeather: 3 # Frontier
+    ClothingShoesColorBrown: 3 # Frontier
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index 4c7415aa0a7..516f22cd779 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -9,7 +9,13 @@
     ClothingHeadsetService: 2
     ClothingOuterWinterJani: 2
     ClothingNeckScarfStripedPurple: 3
-
-  emaggedInventory:
+    ClothingHeadHatHoodBioJanitor: 1 # Frontier - Bio suit
+    ClothingOuterBioJanitor: 1 # Frontier - Bio suit
+  contrabandInventory: # Frontier - Hidden inventory
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1
+    UniformMaid: 1
+  emaggedInventory: # Frontier - Emagged inventory
+    ClothingHeadHatTacticalMaidHeadband: 1
+    ClothingUniformJumpskirtTacticalMaid: 1
+    ClothingHandsTacticalMaidGloves: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index ef1c5654742..dc04ba56a42 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -1,10 +1,10 @@
 - type: vendingMachineInventory
   id: NanoMedPlusInventory
   startingInventory:
-    HandheldHealthAnalyzer: 10
+    HandheldHealthAnalyzer: 5
     Brutepack: 15
     Ointment: 15
     Bloodpack: 15
     EpinephrineChemistryBottle: 9
-    Syringe: 15
+    Syringe: 9
     BoxMedicalTrackingImplants: 15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index 29772099d6a..b174be2d8c2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -1,23 +1,69 @@
 - type: vendingMachineInventory
   id: MediDrobeInventory
   startingInventory:
-    ClothingBackpackDuffelMedical: 4
     ClothingBackpackMedical: 4
     ClothingBackpackSatchelMedical: 4
-    ClothingUniformJumpsuitParamedic: 4
-    ClothingUniformJumpskirtParamedic: 4
-    ClothingHeadNurseHat: 4
+    ClothingBackpackDuffelMedical: 4
+    ClothingUniformJumpsuitMedicalDoctor: 4
+    ClothingUniformJumpskirtMedicalDoctor: 4
+    ClothingOuterWinterMed: 2
     ClothingOuterCoatLab: 4
+    ClothingBeltMedical: 4 # Frontier - Medical Belt, empty
+    ClothingEyesHudMedical: 4 # Frontier - Not working yet
+    ClothingHeadsetMedical: 4
+    EncryptionKeyMedical: 10
+    ClothingHeadNurseHat: 4
     ClothingShoesColorWhite: 4
     ClothingHandsGlovesLatex: 4
-    ClothingHeadsetMedical: 4
-    ClothingOuterWinterMed: 2
+    ClothingOuterHospitalGown: 5
+    UniformScrubsColorGreen: 4
+    UniformScrubsColorBlue: 4
+    UniformScrubsColorPurple: 4
+# Paramed:
+    ClothingUniformJumpsuitParamedic: 4
+    ClothingUniformJumpskirtParamedic: 4
     ClothingOuterWinterPara: 2
     ClothingOuterCoatParamedicWB: 2
     ClothingHeadHatParamedicsoft: 2
     ClothingHeadHelmetVoidParamed: 1
     ClothingOuterHardsuitVoidParamed: 1
-    ClothingOuterHospitalGown: 5
-    UniformScrubsColorGreen: 4
-    UniformScrubsColorBlue: 4
-    UniformScrubsColorPurple: 4
+# Virology:
+    ClothingBackpackVirology: 2
+    ClothingBackpackSatchelVirology: 2
+    ClothingBackpackDuffelVirology: 2
+    ClothingUniformJumpsuitVirology: 2
+    ClothingUniformJumpskirtVirology: 2
+    ClothingOuterWinterViro: 2
+    ClothingOuterCoatLabViro: 2
+    ClothingMaskSterile: 4
+    ClothingHeadHatHoodBioVirology: 2
+    ClothingOuterBioVirology: 2
+# Chem:
+    ClothingBackpackChemistry: 2
+    ClothingBackpackSatchelChemistry: 2
+    ClothingBackpackDuffelChemistry: 2
+    ChemBag: 2
+    HandLabeler: 4
+    ClothingUniformJumpsuitChemistry: 2
+    ClothingUniformJumpskirtChemistry: 2
+    ClothingOuterWinterChem: 2
+    ClothingOuterCoatLabChem: 2
+# Physician:
+    ClothingUniformJumpsuitSeniorPhysician: 1
+    ClothingUniformJumpskirtSeniorPhysician: 1
+    ClothingOuterCoatLabSeniorPhysician: 1
+# CMO:
+    ClothingUniformJumpsuitCMO: 1
+    ClothingUniformJumpskirtCMO: 1
+    ClothingHeadsetAltMedical: 1
+    ClothingOuterWinterCMO: 1
+    ClothingOuterCoatLabCmo: 1
+    ClothingHandsGlovesNitrile: 1
+    ClothingHeadHatBeretCmo: 1
+    ClothingNeckMantleCMO: 1
+    ClothingCloakCmo: 1
+    RubberStampCMO: 1
+    ClothingHeadHatHoodBioCmo: 1
+    ClothingOuterBioCmo: 1
+  contrabandInventory: # Frontier - Hidden inventory
+    ClothingUniformJumpskirtOfLife: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
index e554efacd11..d88e7d57d19 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -7,6 +7,7 @@
     HydroponicsToolScythe: 3
     HydroponicsToolHatchet: 3
     PlantBag: 3
+    HandLabeler: 3 # Frontier
     PlantBGoneSpray: 20
     WeedSpray: 20
     PestSpray: 20
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
index 6dab237f357..94af4047d84 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -14,3 +14,29 @@
     ClothingMaskGas: 3
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
+    ClothingHeadHatHoodBioScientist: 1
+    ClothingOuterBioScientist: 1
+# RoboDrobe:
+    ClothingOuterCoatRobo: 2
+    ClothingUniformJumpsuitRoboticist: 2
+    ClothingUniformJumpskirtRoboticist: 2
+    ClothingShoesColorBlack: 2
+    ClothingHandsGlovesFingerless: 2
+    ClothingHeadHatCorpsoft: 2
+    ClothingHeadBandSkull: 2
+    ClothingHeadsetRobotics: 2
+    ClothingOuterWinterRobo: 2
+# Senior:
+    ClothingUniformJumpsuitSeniorResearcher: 1
+    ClothingUniformJumpskirtSeniorResearcher: 1
+    ClothingOuterCoatLabSeniorResearcher: 1
+# RD:
+    ClothingUniformJumpsuitResearchDirector: 1
+    ClothingUniformJumpskirtResearchDirector: 1
+    ClothingOuterWinterRD: 1
+    ClothingHeadHatBeretRND: 1
+    ClothingNeckMantleRD: 1
+    ClothingNeckCloakRd: 1
+    ClothingHandsGlovesColorPurple: 1
+    ClothingHeadsetAltScience: 1
+    RubberStampRd: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
index f487985450c..92b23af20ac 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
@@ -15,3 +15,6 @@
   startingInventory:
     PlasmaTankFilled: 10
     OxygenTankFilled: 10
+  emaggedInventory:
+    DoubleEmergencyOxygenTankFilled: 1
+    DoubleEmergencyNitrogenTankFilled: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index b662d4f2ae3..54ed0d93c5d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -43,6 +43,8 @@
     ClothingHeadHatHairflower: 1
     ClothingHeadHatGladiator: 1
     ClothingUniformJumpsuitGladiator: 1
+    RubberStampClown: 1
+    RubberStampMime: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
index 405e2eff564..c90a11192a3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
@@ -1,8 +1,8 @@
 - type: vendingMachineInventory
   id: NanoMedInventory
   startingInventory:
-    Brutepack: 3
-    Ointment: 3
-    Bloodpack: 3
-    EpinephrineChemistryBottle: 3
-    Syringe: 3
+    Brutepack: 6
+    Ointment: 6
+    Bloodpack: 6
+    EpinephrineChemistryBottle: 6
+    Syringe: 6
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 8c201c29c41..71ec718bc73 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -71,6 +71,8 @@
         Slash: 0.95
         Heat: 0.90
         Radiation: 0.75
+  - type: StaticPrice
+    price: 25
 
 #Ancient Void Helmet
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
index fec4d4df6c7..7391ea9901f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
@@ -13,6 +13,8 @@
     modifiers:
       coefficients:
         Caustic: 0.5
+  - type: VendPrice
+    price: 400
 
 - type: entity
   parent: ClothingOuterBioGeneral
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index df493b06607..ab2b8b90f0a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -114,3 +114,7 @@
         Radiation: 0.75
         Caustic: 0.5
   - type: GroupExamine
+  - type: VendPrice # Frontier
+    price: 750
+  - type: StaticPrice # Frontier
+    price: 50
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 6c111c01662..a0e0ea3e15e 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1278,8 +1278,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSeniorOfficer
-  name: senior officer jumpsuit
-  description: A sign of skill and prestige within the security department.
+  name: sergeant jumpsuit
+  description: A sign of skill and prestige within the sheriff's department.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index 5f2ce47ba13..9b12587ac64 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -11,6 +11,8 @@
     tags:
     - Metal
   - type: SpaceGarbage
+  - type: StaticPrice # Frontier
+    price: 1
 
 - type: entity
   parent: UtensilBase
@@ -19,8 +21,6 @@
   components:
   - type: Utensil
     breakChance: 0.20
-  - type: StaticPrice
-    price: 0
   - type: Tag
     tags:
      - Plastic
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 6341d80ee69..23bbc770457 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -65,6 +65,9 @@
     ears: ClothingHeadsetAltCentCom
     eyes: ClothingEyesGlassesSunglasses
     belt: BoxFolderQmClipboard # Frontier
+    neck: ClothingNeckCloakHop # Frontier
+    outerClothing: ClothingOuterWinterHoP # Frontier
+    pocket1: WeaponDisabler # Frontier
   innerClothingSkirt: ClothingUniformJumpskirtHoP
   satchel: ClothingBackpackSatchelHOPFilled
   duffelbag: ClothingBackpackDuffelHOPFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
index 8defeded8bd..da9a8e06aff 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
@@ -5,27 +5,25 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakQm
+#      - id: ClothingNeckCloakQm # Frontier
 #      - id: BoxFolderQmClipboard # Frontier - Moved to SR backpack
-      - id: ClothingHeadsetCargo
-      - id: ClothingUniformJumpsuitQMTurtleneck
-      - id: ClothingUniformJumpskirtQMTurtleneck
-      - id: ClothingHandsGlovesColorBrown
-      - id: ClothingShoesColorBrown
-      - id: ClothingHeadHatQMsoft
+#      - id: ClothingHeadsetCargo # Frontier
+#      - id: ClothingUniformJumpsuitQMTurtleneck # Frontier
+#      - id: ClothingUniformJumpskirtQMTurtleneck # Frontier
+#      - id: ClothingHandsGlovesColorBrown # Frontier
+#      - id: ClothingShoesColorBrown # Frontier
+#      - id: ClothingHeadHatQMsoft # Frontier
 #      - id: CargoRequestComputerCircuitboard # Frontier
 #      - id: CargoShuttleComputerCircuitboard # Frontier
 #      - id: CargoShuttleConsoleCircuitboard # Frontier
 #      - id: SalvageShuttleConsoleCircuitboard # Frontier
 #      - id: CargoBountyComputerCircuitboard # Frontier
-      - id: CigPackGreen
-        prob: 0.50
+#      - id: CigPackGreen # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteCargo # Frontier
       - id: RubberStampQm
       - id: ClothingHeadsetAltCargo
-      - id: BoxEncryptionKeyCargo
-      - id: ClothingNeckMantleQM # Frontier
-      - id: ClothingOuterWinterQM # Frontier
+#      - id: BoxEncryptionKeyCargo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
       - id: OxygenTankFilled # Frontier
       - id: NitrogenTankFilled # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
index 7d9c2ffc396..138e53a3327 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
@@ -5,19 +5,18 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetVoidParamed
-      - id: ClothingOuterHardsuitVoidParamed
-      - id: ClothingOuterCoatParamedicWB
-      - id: ClothingHeadHatParamedicsoft
-      - id: ClothingUniformJumpsuitParamedic
-      - id: ClothingUniformJumpskirtParamedic
+#      - id: ClothingHeadHelmetVoidParamed # Frontier
+#      - id: ClothingOuterHardsuitVoidParamed # Frontier
+#      - id: ClothingOuterCoatParamedicWB # Frontier
+#      - id: ClothingHeadHatParamedicsoft # Frontier
+#      - id: ClothingUniformJumpsuitParamedic # Frontier
+#      - id: ClothingUniformJumpskirtParamedic # Frontier
       - id: ClothingEyesHudMedical
       - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetMedical
+#      - id: ClothingHeadsetMedical  # Frontier
       - id: ClothingMaskSterile
-      - id: MedkitFilled
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
+      - id: ClothingBeltParamedicFilled # Frontier
+      - id: MedkitFilled # Frontier
       - id: NitrogenTankFilled # Frontier
       - id: OxygenTankFilled # Frontier
       - id: ClothingMaskBreathMedical # Frontier