diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index b49fa383bc..a5b06fca03 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -20,16 +20,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterSuitEmergency
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyOxygenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: OxygenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: ToolboxEmergencyFilled
-        prob: 0.4
+        prob: 0.5
       - id: MedkitOxygenFilled
         prob: 0.2
       - id: WeaponFlareGun
@@ -44,16 +44,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterSuitEmergency
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyOxygenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: OxygenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: ToolboxEmergencyFilled
-        prob: 0.4
+        prob: 0.5
       - id: MedkitOxygenFilled
         prob: 0.2
       - id: WeaponFlareGun
@@ -69,39 +69,62 @@
   - type: StorageFill
     contents:
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyNitrogenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: NitrogenTank
       - id: NitrogenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: NitrogenTank
 
 - type: entity
   id: ClosetFireFilled
   parent: ClosetFire
   suffix: Filled
   components:
-    - type: StorageFill
-      contents:
-        - id: ClothingOuterSuitFire
-        - id: ClothingHeadHelmetFire
-        - id: ClothingMaskGas
-        - id: OxygenTankFilled
-        - id: FireExtinguisher
-          prob: 0.25
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitFire
+      - id: ClothingHeadHelmetFire
+      - id: ClothingMaskGas
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: OxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: CrowbarRed
+      - id: FireExtinguisher
+        prob: 0.98
+        orGroup: FireExtinguisher
+      - id: SprayBottleWater #It's just budget cut after budget cut man
+        prob: 0.02
+        orGroup: FireExtinguisher
+
 - type: entity
   id: ClosetWallFireFilledRandom
   parent: ClosetWallFire
   suffix: Filled
   components:
-    - type: StorageFill
-      contents:
-        - id: ClothingOuterSuitFire
-        - id: ClothingHeadHelmetFire
-        - id: ClothingMaskGas
-        - id: OxygenTankFilled
-        - id: FireExtinguisher
-          prob: 0.25
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitFire
+      - id: ClothingHeadHelmetFire
+      - id: ClothingMaskGas
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: OxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: CrowbarRed
+      - id: FireExtinguisher
+        prob: 0.98
+        orGroup: FireExtinguisher
+      - id: SprayBottleWater #It's just budget cut after budget cut man
+        prob: 0.02
+        orGroup: FireExtinguisher
+
 - type: entity
   id: ClosetMaintenanceFilledRandom
   suffix: Filled, Random