diff --git a/Resources/Prototypes/Catalog/Fills/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Fills/belt.yml
rename to Resources/Prototypes/Catalog/Fills/Items/belt.yml
diff --git a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Fills/gas_tanks.yml
rename to Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
diff --git a/Resources/Prototypes/Catalog/Fills/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Fills/toolboxes.yml
rename to Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_armory.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/armory.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_armory.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/armory.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/botany.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_botany.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/botany.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_emergency.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/emergency.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_emergency.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/emergency.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engineering.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engineering.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engines.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_engines.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_food.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/food.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_food.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/food.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_fun.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/fun.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_fun.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/fun.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_materials.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_materials.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/medical.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/medical.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_npc.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/npc.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_npc.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/npc.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_science.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/science.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_science.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/science.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_security.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/security.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_security.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/security.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/service.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml
rename to Resources/Prototypes/Catalog/Fills/Storage/Crates/service.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml
new file mode 100644
index 0000000000..b1ca35303e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml
@@ -0,0 +1,96 @@
+- type: entity
+  id: LockerToolFilled
+  parent: LockerTool
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingOuterVestHazard
+        prob: 0.4
+      - name: FlashlightLantern
+        prob: 0.7
+      - name: Screwdriver
+        prob: 0.7
+      - name: Wrench
+        prob: 0.7
+      - name: Welder
+        prob: 0.7
+      - name: Crowbar
+        prob: 0.7
+      - name: Wirecutter
+        prob: 0.7
+      - name: Multitool
+        prob: 0.2
+      - name: ClothingBeltUtility
+        prob: 0.2
+      - name: ClothingHandsGlovesColorYellow
+        prob: 0.05
+      - name: ClothingHeadHatHardhatRed
+        prob: 0.4
+      - name: ApcExtensionCableStack
+        prob: 0.3
+      - name: ApcExtensionCableStack
+        prob: 0.3
+      - name: ApcExtensionCableStack
+        prob: 0.3
+
+- type: entity
+  id: LockerElectricalSuppliesFilled
+  suffix: Filled
+  parent: LockerElectricalSupplies
+  components:
+  - type: StorageFill
+    contents:
+      - name: ToolboxElectricalFilled
+        prob: 0.7
+      - name: FirelockElectronics
+        prob: 0.05
+      - name: APCElectronics
+        prob: 0.1
+      - name: MVWireStack
+        prob: 0.2
+      - name: ApcExtensionCableStack
+        prob: 0.3
+
+- type: entity
+  id: LockerWeldingSuppliesFilled
+  suffix: Filled
+  parent: LockerWeldingSupplies
+  components:
+  - type: StorageFill
+    contents:
+      - name: WelderMini
+        prob: 1
+      - name: Welder
+        prob: 0.1
+      - name: ClothingHeadHatWelding
+        prob: 0.5
+
+- type: entity
+  id: LockerAtmosphericsFilled
+  suffix: Filled
+  parent: LockerAtmospherics
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHeadHelmetHardsuitAtmos
+      - name: ClothingOuterHardsuitAtmos
+      - name: ClothingMaskBreath
+      - name: OxygenTankFilled
+
+- type: entity
+  id: LockerEngineerFilled
+  suffix: Filled
+  parent: LockerEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHeadHelmetHardsuitEngineering
+      - name: ClothingOuterHardsuitEngineering
+      - name: ClothingMaskBreath
+      - name: OxygenTankFilled
+
+- type: entity
+  id: LockerRadiationSuitFilled
+  parent: LockerRadiationSuit
+  suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml
new file mode 100644
index 0000000000..613c3fd52a
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml
@@ -0,0 +1,196 @@
+- type: entity
+  id: LockerQuarterMasterFilled
+  suffix: Filled
+  parent: LockerQuarterMaster
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingNeckCloakQm
+        prob: 1
+      - name: ClothingHeadsetCargo
+        prob: 1
+      - name: PlushieLizard
+        prob: 0.1
+      - name: ClothingHandsGlovesColorBrown
+        prob: 1
+      - name: ClothingOuterSuitFire
+        prob: 0.5
+      - name: ClothingShoesColorBrown
+        prob: 0.7
+      - name: ClothingHeadHatCargosoft
+        prob: 0.8
+      - name: SupplyRequestComputerCircuitboard
+        prob: 1
+      - name: SupplyComputerCircuitboard
+        prob: 1
+      - name: CigPackGreen
+        prob: 0.50
+
+- type: entity
+  id: LockerCaptainFilled
+  suffix: Filled
+  parent: LockerCaptain
+  components:
+  - type: StorageFill
+    contents:
+      - name: NukeDisk
+        prob: 1
+      - name: CaptainIDCard
+        prob: 1
+      - name: ClothingHeadHatCaptain
+        prob: 1
+      - name: ClothingNeckCloakCap
+        prob: 1
+      - name: ClothingHandsGlovesCaptain
+        prob: 1
+      - name: ClothingOuterHardsuitCap
+        prob: 1
+      - name: TaserGun
+        prob: 1
+      - name: ClothingShoesColorBlack
+        prob: 0.7
+      - name: ClothingHeadHelmetHardsuitCap
+        prob: 1
+      - name: CommsComputerCircuitboard
+        prob: 1
+      - name: ClothingHeadsetAltCommand
+        prob: 1
+      - name: PlushieNuke
+        prob: 0.1
+      - name: CigarGoldCase
+        prob: 0.25
+
+- type: entity
+  id: LockerHeadOfPersonnelFilled
+  suffix: Filled
+  parent: LockerHeadOfPersonnel
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingNeckCloakHop
+        prob: 1
+      - name: ClothingHeadHatHopcap
+        prob: 1
+      - name: HoPIDCard
+        prob: 0.9
+      - name: ClothingHeadsetCommand
+        prob: 1
+      - name: BoxPDA
+        prob: 1
+      - name: IDComputerCircuitboard
+        prob: 1
+      - name: TaserGun
+        prob: 1
+      - name: ClothingShoesColorBlack
+        prob: 0.7
+      - name: PlushieLizard
+        prob: 0.1
+      - name: CigarGoldCase
+        prob: 0.10
+        # Fuck the HoP they don't deserve fucking cigars.
+
+- type: entity
+  id: LockerChiefEngineerFilled
+  suffix: Filled
+  parent: LockerChiefEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHeadHelmetHardsuitEngineeringWhite
+      - name: ClothingOuterHardsuitEngineeringWhite
+      - name: ClothingMaskBreath
+      - name: OxygenTankFilled
+      - name: ClothingNeckCloakCe
+      - name: ClothingEyesGlassesMeson
+      - name: ClothingBeltChiefEngineerFilled
+      - name: ClothingHeadHatBeretEngineering
+      - name: CigarCase
+        prob: 0.15
+
+- type: entity
+  id: LockerChiefMedicalOfficerFilled
+  suffix: Filled
+  parent: LockerChiefMedicalOfficer
+  components:
+  - type: StorageFill
+    contents:
+      - name: MedkitFilled
+        prob: 1
+      - name: ClothingHandsGlovesLatex
+        prob: 1
+      #- name: ClothingEyesHudMedical #Removed until working properly
+      #  prob: 1
+      - name: ClothingHeadsetAltMedical
+        prob: 1
+      - name: ClothingCloakCmo
+        prob: 1
+      - name: ClothingBackpackDuffelSurgeryFilled
+        prob: 1
+      - name: ClothingOuterCoatLabCmo
+        prob: 1
+      - name: ClothingMaskSterile
+        prob: 1
+
+- type: entity
+  id: LockerResearchDirectorFilled
+  suffix: Filled
+  parent: LockerResearchDirector
+  components:
+  - type: StorageFill
+    contents:
+      - name: ResearchComputerCircuitboard
+        prob: 1
+      - name: ProtolatheMachineCircuitboard
+        prob: 1
+      - name: ClothingNeckCloakRd
+        prob: 1
+      - name: ClothingHeadsetMedicalScience
+        prob: 1
+      - name: PlushieSlime
+        prob: 0.1
+
+- type: entity
+  id: LockerHeadOfSecurityFilled
+  suffix: Filled
+  parent: LockerHeadOfSecurity
+  components:
+  - type: StorageFill
+    contents:
+      - name: TaserGun
+        prob: 1
+      - name: ClothingHeadHatBeretHoS
+        prob: 1
+      - name: ClothingHeadHatHoshat
+        prob: 1
+      - name: ClothingNeckCloakHos
+        prob: 1
+      - name: ClothingOuterCoatHoSTrench
+        prob: 1
+      - name: ClothingUniformJumpskirtHoSAlt
+        prob: 1
+      - name: ClothingUniformJumpsuitHoSAlt
+        prob: 1
+      - name: ClothingUniformJumpsuitHoSBlue
+        prob: 0.5
+      - name: ClothingUniformJumpsuitHoSGrey
+        prob: 0.5
+      - name: ClothingUniformJumpsuitHoSParadeMale
+        prob: 0.1
+      - name: ClothingUniformJumpskirtHoSParadeMale
+        prob: 0.1
+      - name: ClothingHeadHelmetHardsuitSecurityRed
+        prob: 1
+      - name: ClothingOuterHardsuitSecurityRed
+        prob: 1
+      - name: DrinkVacuumFlask
+        prob: 0.8
+      - name: ClothingBeltSecurityFilled
+        prob: 1
+      - name: ClothingHeadsetAltSecurity
+        prob: 1
+      - name: ClothingEyesGlassesSecurity
+        prob: 1
+      - name: ClothingShoesBootsJack
+        prob: 1
+      - name: CigarGoldCase
+        prob: 0.50
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/l3.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/l3.yml
new file mode 100644
index 0000000000..fdb7259d21
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/l3.yml
@@ -0,0 +1,24 @@
+# - type: entity
+#   id: LockerL3Filled
+#   suffix: Filled, Generic
+#   parent: LockerL3
+
+ - type: entity
+   id: LockerL3VirologyFilled
+   suffix: Filled, Virology
+   parent: LockerL3Virology
+
+ - type: entity
+   id: LockerL3SecurityFilled
+   suffix: Filled, Security
+   parent: LockerL3Security
+
+ - type: entity
+   id: LockerL3JanitorFilled
+   suffix: Filled, Janitor
+   parent: LockerL3Janitor
+
+# - type: entity
+#   id: LockerL3ScienceFilled
+#   suffix: Filled, Science
+#   parent: LockerL3Virology
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/medical.yml
new file mode 100644
index 0000000000..f83749f6d7
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/medical.yml
@@ -0,0 +1,52 @@
+- type: entity
+  id: LockerMedicineFilled
+  suffix: Filled
+  parent: LockerMedicine
+
+- type: entity
+  id: LockerMedicalFilled
+  suffix: Filled
+  parent: LockerMedical
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHandsGlovesLatex
+        prob: 1
+      - name: ClothingHeadsetMedical
+        prob: 1
+     # - name: ClothingEyesHudMedical #Removed until working properly
+     #   prob: 1
+      - name: ClothingBeltMedical
+        prob: 1
+      - name: ClothingHeadHatSurgcapBlue
+        prob: 1
+        orGroup: Surgcaps
+      - name: ClothingHeadHatSurgcapGreen
+        prob: 0.1
+        orGroup: Surgcaps
+      - name: ClothingHeadHatSurgcapPurple
+        prob: 0.05
+        orGroup: Surgcaps
+      - name: UniformScrubsColorBlue
+        prob: 0.5
+        orGroup: Surgshrubs
+      - name: UniformScrubsColorGreen
+        prob: 0.1
+        orGroup: Surgshrubs
+      - name: UniformScrubsColorPurple
+        prob: 0.05
+        orGroup: Surgshrubs
+      - name: ClothingMaskSterile
+        prob: 1
+
+- type: entity
+  id: LockerChemistryFilled
+  suffix: Filled
+  parent: LockerChemistry
+  components:
+  - type: StorageFill
+    contents:
+      - name: BoxSyringe
+        prob: 1
+      - name: BoxBeaker
+        prob: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/misc.yml
new file mode 100644
index 0000000000..98eb4d930e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/misc.yml
@@ -0,0 +1,34 @@
+# - type: entity
+#   id: LockerSyndicatePersonalFilled
+#   suffix: Filled
+#   parent: LockerSyndicatePersonal
+
+- type: entity
+  id: LockerEmergencyFilledRandom
+  parent: LockerEmergency
+  suffix: Filled, Random
+  components:
+  - type: StorageFill
+    contents:
+      - name: ToolboxEmergencyFilled
+        prob: 0.4
+      - name: ClothingMaskBreath
+        prob: 0.4
+      - name: ClothingMaskBreath
+        prob: 0.25
+      - name: EmergencyOxygenTankFilled
+        prob: 0.4
+      - name: OxygenTankFilled
+        prob: 0.2
+
+- type: entity
+  id: LockerFireFilled
+  parent: LockerFire
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - name: RedOxygenTankFilled
+          prob: 0.6
+        - name: ClothingOuterSuitFire
+          prob: 0.75
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/readmebeforeadding.txt b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/readmebeforeadding.txt
new file mode 100644
index 0000000000..bb93b2ec6f
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/readmebeforeadding.txt
@@ -0,0 +1 @@
+See https://github.com/space-wizards/space-station-14/pull/2427#issuecomment-718152557
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/security.yml
new file mode 100644
index 0000000000..8ecd9448ba
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/security.yml
@@ -0,0 +1,61 @@
+- type: entity
+  id: LockerWardenFilled
+  suffix: Filled
+  parent: LockerWarden
+  components:
+  - type: StorageFill
+    contents:
+      - name: TaserGun
+        prob: 0.3
+      - name: ClothingHeadHatWarden
+        prob: 1
+      - name: ClothingHeadHatBeretWarden
+        prob: 1
+      - name: ClothingBeltSecurityFilled
+        prob: 1
+      - name: Flash
+        prob: 1
+      - name: ClothingEyesGlassesSecurity
+        prob: 1
+      - name: ClothingHeadsetAltSecurity
+        prob: 1
+      - name: ClothingHandsGlovesCombat
+        prob: 1
+      - name: ClothingShoesBootsJack
+        prob: 1
+
+- type: entity
+  id: LockerSecurityFilled
+  suffix: Filled
+  parent: LockerSecurity
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingUniformJumpsuitSecGrey
+        prob: 0.3
+      - name: ClothingHeadHelmetHelmet
+        prob: 1
+      - name: ClothingOuterArmorBulletproof
+        prob: 1
+      - name: ClothingBeltSecurityFilled
+        prob: 1
+      - name: Flash
+        prob: 0.5
+      - name: ClothingEyesGlassesSecurity
+        prob: 1
+      - name: ClothingHeadsetSecurity
+        prob: 1
+      - name: ClothingHandsGlovesColorBlack
+        prob: 1
+      - name: ClothingShoesBootsJack
+        prob: 1
+
+#- type: entity
+#  id: LockerDetectiveFilled
+#  suffix: Filled
+#  parent: LockerDetective
+
+- type: entity
+  id: LockerBombFilled
+  parent: LockerBomb
+  suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/service.yml
new file mode 100644
index 0000000000..00790d63d3
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/service.yml
@@ -0,0 +1,80 @@
+- type: entity
+  id: LockerBoozeFilled
+  suffix: Filled
+  parent: LockerBooze
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingOuterArmorBulletproof
+        prob: 0.5
+      - name: ShotgunSawn
+        prob: 0.8
+      - name: DrinkShaker
+        prob: 1
+      - name: ClothingEyesGlassesBeer
+        prob: 1
+      - name: DrinkBeer
+        prob: 0.5
+      - name: DrinkBottleBeer
+        prob: 0.5
+
+#- type: entity
+#  id: LockerFormalFilled
+#  suffix: Filled
+#  parent: LockerFormal
+
+- type: entity
+  id: LockerChefFilled
+  suffix: Filled
+  parent: LockerChef
+  components:
+  - type: StorageFill
+    contents:
+      - name: CrowbarRed
+      - name: FoodContainerMonkeyCubeBox
+      - name: SprayBottleWater
+      - name: ReagentContainerFlour
+
+- type: entity
+  id: LockerJanitorFilled
+  suffix: Filled
+  parent: LockerJanitor
+  components:
+  - type: StorageFill
+    contents:
+      - name: MopItem
+      - name: WetFloorSign
+        amount: 3
+      - name: TrashBag
+        amount: 2
+
+#- type: entity
+#  id: LockerLegalFilled
+#  suffix: Filled
+#  parent: LockerLegal
+
+- type: entity
+  id: LockerBotanistFilled
+  suffix: Filled
+  parent: LockerBotanist
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHandsGlovesLeather
+        prob: 1
+      - name: ClothingHandsGlovesLeather
+        prob: 0.8
+      - name: ClothingOuterApronBotanist
+        prob: 1
+      - name: ClothingOuterApronBotanist
+        prob: 0.8
+      - name: TowercapSeeds
+        prob: 1
+      - name: BananaSeeds
+        prob: 0.8
+      - name: EggySeeds
+        prob: 0.5
+      - name: AppleSeeds
+        prob: 0.8
+      - name: TomatoSeeds
+        prob: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_colors.yml
new file mode 100644
index 0000000000..7139474206
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_colors.yml
@@ -0,0 +1,39 @@
+#- type: entity
+#  id: WardrobeGreyFilled
+#  suffix: Filled
+#  parent: WardrobeGrey
+
+#- type: entity
+#  id: WardrobeMixedFilled
+#  suffix: Filled
+#  parent: WardrobeMixed
+
+#- type: entity
+#  id: WardrobeYellowFilled
+#  suffix: Filled
+#  parent: WardrobeYellow
+
+- type: entity
+  id: WardrobeWhiteFilled
+  suffix: Filled
+  parent: WardrobeWhite
+
+#- type: entity
+#  id: WardrobeBlueFilled
+#  suffix: Filled
+#  parent: WardrobeBlue
+
+#- type: entity
+#  id: WardrobePinkFilled
+#  suffix: Filled
+#  parent: WardrobePink
+
+#- type: entity
+#  id: WardrobeBlackFilled
+#  suffix: Filled
+#  parent: WardrobeBlack
+
+#- type: entity
+#  id: WardrobeGreenFilled
+#  suffix: Filled
+#  parent: WardrobeGreen
diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml
new file mode 100644
index 0000000000..10f3b1e93f
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml
@@ -0,0 +1,75 @@
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+
+#- type: entity
+#  id: WardrobePajamaFilled
+#  suffix: Filled
+#  parent: WardrobeWhite
+#  name: pajama wardrobe
+
+# - type: entity
+#   id: WardrobeRoboticsFilled
+#   suffix: Filled
+#   parent: WardrobeRobotics
+
+# - type: entity
+#   id: WardrobeChemistryFilled
+#   suffix: Filled
+#   parent: WardrobeChemistry
+
+# - type: entity
+#   id: WardrobeGeneticsFilled
+#   suffix: Filled
+#   parent: WardrobeGenetics
+
+# - type: entity
+#   id: WardrobeVirologyFilled
+#   suffix: Filled
+#   parent: WardrobeVirology
+
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+
+# - type: entity
+#   id: WardrobeBotanistFilled
+#   suffix: Filled
+#   parent: WardrobeBotanist
+
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+  components:
+  - type: StorageFill
+    contents:
+      - name: ClothingHandsGlovesLatex
+        prob: 0.4
+
+# - type: entity
+#   id: WardrobeChapelFilled
+#   suffix: Filled
+#   parent: WardrobeChapel
+
+# - type: entity
+#   id: WardrobeSecurityFilled
+#   suffix: Filled
+#   parent: WardrobeSecurity
+
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml
deleted file mode 100644
index 0a728abee8..0000000000
--- a/Resources/Prototypes/Catalog/Fills/lockers.yml
+++ /dev/null
@@ -1,676 +0,0 @@
-- type: entity
-  id: LockerToolFilled
-  parent: LockerTool
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingOuterVestHazard
-        prob: 0.4
-      - name: FlashlightLantern
-        prob: 0.7
-      - name: Screwdriver
-        prob: 0.7
-      - name: Wrench
-        prob: 0.7
-      - name: Welder
-        prob: 0.7
-      - name: Crowbar
-        prob: 0.7
-      - name: Wirecutter
-        prob: 0.7
-      - name: Multitool
-        prob: 0.2
-      - name: ClothingBeltUtility
-        prob: 0.2
-      - name: ClothingHandsGlovesColorYellow
-        prob: 0.05
-      - name: ClothingHeadHatHardhatRed
-        prob: 0.4
-      - name: ApcExtensionCableStack
-        prob: 0.3
-      - name: ApcExtensionCableStack
-        prob: 0.3
-      - name: ApcExtensionCableStack
-        prob: 0.3
-
-- type: entity
-  id: LockerEmergencyFilledRandom
-  parent: LockerEmergency
-  suffix: Filled, Random
-  components:
-  - type: StorageFill
-    contents:
-      - name: ToolboxEmergencyFilled
-        prob: 0.4
-      - name: ClothingMaskBreath
-        prob: 0.4
-      - name: ClothingMaskBreath
-        prob: 0.25
-      - name: EmergencyOxygenTankFilled
-        prob: 0.4
-      - name: OxygenTankFilled
-        prob: 0.2
-
-- type: entity
-  id: LockerBoozeFilled
-  suffix: Filled
-  parent: LockerBooze
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingOuterArmorBulletproof
-        prob: 0.5
-      - name: ShotgunSawn
-        prob: 0.8
-      - name: DrinkShaker
-        prob: 1
-      - name: ClothingEyesGlassesBeer
-        prob: 1
-      - name: DrinkBeer
-        prob: 0.5
-      - name: DrinkBottleBeer
-        prob: 0.5
-
-- type: entity
-  id: LockerQuarterMasterFilled
-  suffix: Filled
-  parent: LockerQuarterMaster
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingNeckCloakQm
-        prob: 1
-      - name: ClothingHeadsetCargo
-        prob: 1
-      - name: PlushieLizard
-        prob: 0.1
-      - name: ClothingHandsGlovesColorBrown
-        prob: 1
-      - name: ClothingOuterSuitFire
-        prob: 0.5
-      - name: ClothingShoesColorBrown
-        prob: 0.7
-      - name: ClothingHeadHatCargosoft
-        prob: 0.8
-      - name: SupplyRequestComputerCircuitboard
-        prob: 1
-      - name: SupplyComputerCircuitboard
-        prob: 1
-      - name: CigPackGreen
-        prob: 0.50
-
-- type: entity
-  id: LockerCaptainFilled
-  suffix: Filled
-  parent: LockerCaptain
-  components:
-  - type: StorageFill
-    contents:
-      - name: NukeDisk
-        prob: 1
-      - name: CaptainIDCard
-        prob: 1
-      - name: ClothingHeadHatCaptain
-        prob: 1
-      - name: ClothingNeckCloakCap
-        prob: 1
-      - name: ClothingHandsGlovesCaptain
-        prob: 1
-      - name: ClothingOuterHardsuitCap
-        prob: 1
-      - name: TaserGun
-        prob: 1
-      - name: ClothingShoesColorBlack
-        prob: 0.7
-      - name: ClothingHeadHelmetHardsuitCap
-        prob: 1
-      - name: CommsComputerCircuitboard
-        prob: 1
-      - name: ClothingHeadsetAltCommand
-        prob: 1
-      - name: PlushieNuke
-        prob: 0.1
-      - name: CigarGoldCase
-        prob: 0.25
-
-- type: entity
-  id: LockerHeadOfPersonnelFilled
-  suffix: Filled
-  parent: LockerHeadOfPersonnel
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingNeckCloakHop
-        prob: 1
-      - name: ClothingHeadHatHopcap
-        prob: 1
-      - name: HoPIDCard
-        prob: 0.9
-      - name: ClothingHeadsetCommand
-        prob: 1
-      - name: BoxPDA
-        prob: 1
-      - name: IDComputerCircuitboard
-        prob: 1
-      - name: TaserGun
-        prob: 1
-      - name: ClothingShoesColorBlack
-        prob: 0.7
-      - name: PlushieLizard
-        prob: 0.1
-      - name: CigarGoldCase
-        prob: 0.10
-        # Fuck the HoP they don't deserve fucking cigars.
-
-- type: entity
-  id: LockerChiefEngineerFilled
-  suffix: Filled
-  parent: LockerChiefEngineer
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHeadHelmetHardsuitEngineeringWhite
-      - name: ClothingOuterHardsuitEngineeringWhite
-      - name: ClothingMaskBreath
-      - name: OxygenTankFilled
-      - name: ClothingNeckCloakCe
-      - name: ClothingEyesGlassesMeson
-      - name: ClothingBeltChiefEngineerFilled
-      - name: ClothingHeadHatBeretEngineering
-      - name: CigarCase
-        prob: 0.15
-
-- type: entity
-  id: LockerElectricalSuppliesFilled
-  suffix: Filled
-  parent: LockerElectricalSupplies
-  components:
-  - type: StorageFill
-    contents:
-      - name: ToolboxElectricalFilled
-        prob: 0.7
-      - name: FirelockElectronics
-        prob: 0.05
-      - name: APCElectronics
-        prob: 0.1
-      - name: MVWireStack
-        prob: 0.2
-      - name: ApcExtensionCableStack
-        prob: 0.3
-
-- type: entity
-  id: LockerWeldingSuppliesFilled
-  suffix: Filled
-  parent: LockerWeldingSupplies
-  components:
-  - type: StorageFill
-    contents:
-      - name: WelderMini
-        prob: 1
-      - name: Welder
-        prob: 0.1
-      - name: ClothingHeadHatWelding
-        prob: 0.5
-
-- type: entity
-  id: LockerAtmosphericsFilled
-  suffix: Filled
-  parent: LockerAtmospherics
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHeadHelmetHardsuitAtmos
-      - name: ClothingOuterHardsuitAtmos
-      - name: ClothingMaskBreath
-      - name: OxygenTankFilled
-
-- type: entity
-  id: LockerEngineerFilled
-  suffix: Filled
-  parent: LockerEngineer
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHeadHelmetHardsuitEngineering
-      - name: ClothingOuterHardsuitEngineering
-      - name: ClothingMaskBreath
-      - name: OxygenTankFilled
-
-- type: entity
-  id: LockerBotanistFilled
-  suffix: Filled
-  parent: LockerBotanist
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHandsGlovesLeather
-        prob: 1
-      - name: ClothingHandsGlovesLeather
-        prob: 0.8
-      - name: ClothingOuterApronBotanist
-        prob: 1
-      - name: ClothingOuterApronBotanist
-        prob: 0.8
-      - name: TowercapSeeds
-        prob: 1
-      - name: BananaSeeds
-        prob: 0.8
-      - name: EggySeeds
-        prob: 0.5
-      - name: AppleSeeds
-        prob: 0.8
-      - name: TomatoSeeds
-        prob: 1
-
-- type: entity
-  id: LockerMedicineFilled
-  suffix: Filled
-  parent: LockerMedicine
-
-- type: entity
-  id: LockerMedicalFilled
-  suffix: Filled
-  parent: LockerMedical
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHandsGlovesLatex
-        prob: 1
-      - name: ClothingHeadsetMedical
-        prob: 1
-     # - name: ClothingEyesHudMedical #Removed until working properly
-     #   prob: 1
-      - name: ClothingBeltMedical
-        prob: 1
-      - name: ClothingHeadHatSurgcapBlue
-        prob: 1
-        orGroup: Surgcaps
-      - name: ClothingHeadHatSurgcapGreen
-        prob: 0.1
-        orGroup: Surgcaps
-      - name: ClothingHeadHatSurgcapPurple
-        prob: 0.05
-        orGroup: Surgcaps
-      - name: UniformScrubsColorBlue
-        prob: 0.5
-        orGroup: Surgshrubs
-      - name: UniformScrubsColorGreen
-        prob: 0.1
-        orGroup: Surgshrubs
-      - name: UniformScrubsColorPurple
-        prob: 0.05
-        orGroup: Surgshrubs
-      - name: ClothingMaskSterile
-        prob: 1
-
-
-- type: entity
-  id: LockerChemistryFilled
-  suffix: Filled
-  parent: LockerChemistry
-  components:
-  - type: StorageFill
-    contents:
-      - name: BoxSyringe
-        prob: 1
-      - name: BoxBeaker
-        prob: 1
-
-- type: entity
-  id: LockerChiefMedicalOfficerFilled
-  suffix: Filled
-  parent: LockerChiefMedicalOfficer
-  components:
-  - type: StorageFill
-    contents:
-      - name: MedkitFilled
-        prob: 1
-      - name: ClothingHandsGlovesLatex
-        prob: 1
-      #- name: ClothingEyesHudMedical #Removed until working properly
-      #  prob: 1
-      - name: ClothingHeadsetAltMedical
-        prob: 1
-      - name: ClothingCloakCmo
-        prob: 1
-      - name: ClothingBackpackDuffelSurgeryFilled
-        prob: 1
-      - name: ClothingOuterCoatLabCmo
-        prob: 1
-      - name: ClothingMaskSterile
-        prob: 1
-
-- type: entity
-  id: LockerResearchDirectorFilled
-  suffix: Filled
-  parent: LockerResearchDirector
-  components:
-  - type: StorageFill
-    contents:
-      - name: ResearchComputerCircuitboard
-        prob: 1
-      - name: ProtolatheMachineCircuitboard
-        prob: 1
-      - name: ClothingNeckCloakRd
-        prob: 1
-      - name: ClothingHeadsetMedicalScience
-        prob: 1
-      - name: PlushieSlime
-        prob: 0.1
-
-- type: entity
-  id: LockerHeadOfSecurityFilled
-  suffix: Filled
-  parent: LockerHeadOfSecurity
-  components:
-  - type: StorageFill
-    contents:
-      - name: TaserGun
-        prob: 1
-      - name: ClothingHeadHatBeretHoS
-        prob: 1
-      - name: ClothingHeadHatHoshat
-        prob: 1
-      - name: ClothingNeckCloakHos
-        prob: 1
-      - name: ClothingOuterCoatHoSTrench
-        prob: 1
-      - name: ClothingUniformJumpskirtHoSAlt
-        prob: 1
-      - name: ClothingUniformJumpsuitHoSAlt
-        prob: 1
-      - name: ClothingUniformJumpsuitHoSBlue
-        prob: 0.5
-      - name: ClothingUniformJumpsuitHoSGrey
-        prob: 0.5
-      - name: ClothingUniformJumpsuitHoSParadeMale
-        prob: 0.1
-      - name: ClothingUniformJumpskirtHoSParadeMale
-        prob: 0.1
-      - name: ClothingHeadHelmetHardsuitSecurityRed
-        prob: 1
-      - name: ClothingOuterHardsuitSecurityRed
-        prob: 1
-      - name: DrinkVacuumFlask
-        prob: 0.8
-      - name: ClothingBeltSecurityFilled
-        prob: 1
-      - name: ClothingHeadsetAltSecurity
-        prob: 1
-      - name: ClothingEyesGlassesSecurity
-        prob: 1
-      - name: ClothingShoesBootsJack
-        prob: 1
-      - name: CigarGoldCase
-        prob: 0.50
-
-- type: entity
-  id: LockerWardenFilled
-  suffix: Filled
-  parent: LockerWarden
-  components:
-  - type: StorageFill
-    contents:
-      - name: TaserGun
-        prob: 0.3
-      - name: ClothingHeadHatWarden
-        prob: 1
-      - name: ClothingHeadHatBeretWarden
-        prob: 1
-      - name: ClothingBeltSecurityFilled
-        prob: 1
-      - name: Flash
-        prob: 1
-      - name: ClothingEyesGlassesSecurity
-        prob: 1
-      - name: ClothingHeadsetAltSecurity
-        prob: 1
-      - name: ClothingHandsGlovesCombat
-        prob: 1
-      - name: ClothingShoesBootsJack
-        prob: 1
-
-- type: entity
-  id: LockerSecurityFilled
-  suffix: Filled
-  parent: LockerSecurity
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
-      - name: ClothingHeadHelmetHelmet
-        prob: 1
-      - name: ClothingOuterArmorBulletproof
-        prob: 1
-      - name: ClothingBeltSecurityFilled
-        prob: 1
-      - name: Flash
-        prob: 0.5
-      - name: ClothingEyesGlassesSecurity
-        prob: 1
-      - name: ClothingHeadsetSecurity
-        prob: 1
-      - name: ClothingHandsGlovesColorBlack
-        prob: 1
-      - name: ClothingShoesBootsJack
-        prob: 1
-
-# Before adding to this - See https://github.com/space-wizards/space-station-14/pull/2427#issuecomment-718152557
-- type: entity
-  id: LockerDetectiveFilled
-  suffix: Filled
-  parent: LockerDetective
-
-- type: entity
-  id: LockerFormalFilled
-  suffix: Filled
-  parent: LockerFormal
-
-- type: entity
-  id: LockerChefFilled
-  suffix: Filled
-  parent: LockerChef
-  components:
-  - type: StorageFill
-    contents:
-      - name: CrowbarRed
-      - name: FoodContainerMonkeyCubeBox
-      - name: SprayBottleWater
-      - name: ReagentContainerFlour
-
-- type: entity
-  id: LockerJanitorFilled
-  suffix: Filled
-  parent: LockerJanitor
-  components:
-  - type: StorageFill
-    contents:
-      - name: MopItem
-      - name: WetFloorSign
-        amount: 3
-      - name: TrashBag
-        amount: 2
-
-- type: entity
-  id: LockerLegalFilled
-  suffix: Filled
-  parent: LockerLegal
-
-- type: entity
-  id: WardrobeChapelFilled
-  suffix: Filled
-  parent: WardrobeChapel
-
-- type: entity
-  id: WardrobeSecurityFilled
-  suffix: Filled
-  parent: WardrobeSecurity
-
-- type: entity
-  id: WardrobeCargoFilled
-  suffix: Filled
-  parent: WardrobeCargo
-
-- type: entity
-  id: WardrobeAtmosphericsFilled
-  suffix: Filled
-  parent: WardrobeAtmospherics
-
-- type: entity
-  id: WardrobeEngineeringFilled
-  suffix: Filled
-  parent: WardrobeEngineering
-
-- type: entity
-  id: WardrobeMedicalDoctorFilled
-  suffix: Filled
-  parent: WardrobeMedicalDoctor
-  components:
-  - type: StorageFill
-    contents:
-      - name: ClothingHandsGlovesLatex
-        prob: 0.4
-
-- type: entity
-  id: WardrobeRoboticsFilled
-  suffix: Filled
-  parent: WardrobeRobotics
-
-- type: entity
-  id: WardrobeChemistryFilled
-  suffix: Filled
-  parent: WardrobeChemistry
-
-- type: entity
-  id: WardrobeGeneticsFilled
-  suffix: Filled
-  parent: WardrobeGenetics
-
-- type: entity
-  id: WardrobeVirologyFilled
-  suffix: Filled
-  parent: WardrobeVirology
-
-- type: entity
-  id: WardrobeScienceFilled
-  suffix: Filled
-  parent: WardrobeScience
-
-- type: entity
-  id: WardrobeBotanistFilled
-  suffix: Filled
-  parent: WardrobeBotanist
-
-- type: entity
-  id: LockerL3Filled
-  suffix: Filled, Generic
-  parent: LockerL3
-
-- type: entity
-  id: LockerL3VirologyFilled
-  suffix: Filled, Virology
-  parent: LockerL3Virology
-
-- type: entity
-  id: LockerL3SecurityFilled
-  suffix: Filled, Security
-  parent: LockerL3Security
-
-- type: entity
-  id: LockerL3JanitorFilled
-  suffix: Filled, Janitor
-  parent: LockerL3Janitor
-
-- type: entity
-  id: LockerL3ScienceFilled
-  suffix: Filled, Science
-  parent: LockerL3Virology
-
-- type: entity
-  id: LockerSyndicatePersonalFilled
-  suffix: Filled
-  parent: LockerSyndicatePersonal
-
-- type: entity
-  id: LockerBombFilled
-  parent: LockerBomb
-  suffix: Filled
-
-- type: entity
-  id: LockerRadiationSuitFilled
-  parent: LockerRadiationSuit
-  suffix: Filled
-# at time of writing, rad suits do nothing, let's not get anyone's hopes up
-#  components:
-#  - type: StorageFill
-#    contents:
-#      - name: OuterclothingRadSuit
-
-- type: entity
-  id: LockerFireFilled
-  parent: LockerFire
-  suffix: Filled
-  components:
-    - type: StorageFill
-      contents:
-        - name: RedOxygenTankFilled
-          prob: 0.6
-        - name: ClothingOuterSuitFire
-          prob: 0.75
-
-- type: entity
-  id: WardrobePajama
-  parent: WardrobeWhite
-  name: pajama wardrobe
-
-- type: entity
-  id: WardrobeBlueFilled
-  suffix: Filled
-  parent: WardrobeBlue
-
-- type: entity
-  id: WardrobePinkFilled
-  suffix: Filled
-  parent: WardrobePink
-
-- type: entity
-  id: WardrobeBlackFilled
-  suffix: Filled
-  parent: WardrobeBlack
-
-- type: entity
-  id: WardrobeGreenFilled
-  suffix: Filled
-  parent: WardrobeGreen
-
-- type: entity
-  id: WardrobePrisonFilled
-  suffix: Filled
-  parent: WardrobePrison
-
-- type: entity
-  id: WardrobeYellowFilled
-  suffix: Filled
-  parent: WardrobeYellow
-
-- type: entity
-  id: WardrobeWhiteFilled
-  suffix: Filled
-  parent: WardrobeWhite
-
-- type: entity
-  id: WardrobePajamaFilled
-  suffix: Filled
-  parent: WardrobePajama
-
-- type: entity
-  id: WardrobeGreyFilled
-  suffix: Filled
-  parent: WardrobeGrey
-
-- type: entity
-  id: WardrobeMixedFilled
-  suffix: Filled
-  parent: WardrobeMixed