diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index febfe23ad16984..513e208b86d6a3 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -69,6 +69,7 @@
       - id: ClothingUniformJumpsuitHosFormal
       - id: ClothingOuterWinterHoS
       - id: ClothingNeckCloakHos
+      - id: ClothingMaskNeckGaiter
 
 - type: entity
   id: DresserQuarterMasterFilled
@@ -106,5 +107,8 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingUniformJumpsuitWarden
+      - id: ClothingUniformJumpskirtWarden
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
+      - id: ClothingOuterWinterWarden
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 1cc97c2401fc01..2ebff46e721943 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -320,11 +320,10 @@
     - id: ClothingBeltSecurityFilled
     - id: ClothingEyesGlassesSecurity
     - id: ClothingHeadsetAltSecurity
-    - id: ClothingMaskNeckGaiter
+    - id: FlashlightSeclite
     - id: ClothingOuterCoatHoSTrench
     - id: ClothingShoesBootsJack
     - id: DoorRemoteSecurity
-    - id: HoloprojectorSecurity
     - id: RubberStampHos
     - id: SecurityTechFabCircuitboard
     - id: WeaponDisabler
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 01038f4196076c..29a8f2bdff7b89 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -8,17 +8,16 @@
       - id: FlashlightSeclite
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
-      - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
       - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitWarden
-      - id: HoloprojectorSecurity
       - id: BookSpaceLaw
+      - id: HandLabeler
+      - id: Multitool
       - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller
@@ -34,16 +33,15 @@
       - id: FlashlightSeclite
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
-      - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
       - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
-      - id: HoloprojectorSecurity
       - id: BookSpaceLaw
+      - id: HandLabeler
+      - id: Multitool
       - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller
@@ -57,23 +55,18 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
-        prob: 0.8
       - id: WeaponDisabler
-      - id: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
       - id: ClothingHeadHelmetBasic
       - id: ClothingOuterArmorBasic
       - id: ClothingBeltSecurityFilled
       - id: Flash
-        prob: 0.5
+      - id: Tourniquet
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
       - id: WeaponMeleeNeedle
         prob: 0.1
-      - id: HoloprojectorSecurity
-        prob: 0.6
       - id: BookSpaceLaw
         prob: 0.5
 
@@ -119,20 +112,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesSecurity
-        prob: 0.3
-      - id: ClothingHeadHatFedoraBrown
-      - id: ClothingNeckTieDet
       - id: ClothingOuterVestDetective
-      - id: ClothingOuterCoatDetective
+      - id: ClothingEyesGlassesSecurity
       - id: FlashlightSeclite
+      - id: ClothingHeadsetSecurity
       - id: ForensicScanner
       - id: LogProbeCartridge
+      - id: HoloprojectorSecurity
       - id: BoxForensicPad
       - id: DrinkDetFlask
-      - id: ClothingHandsGlovesForensic
       - id: RubberStampDetective
-      - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
       - id: HandLabeler
 
@@ -148,7 +137,9 @@
       - id: Wirecutter
       - id: Screwdriver
       - id: Multitool
-        prob: 0.5
+      - id: d10Dice
+        prob: 0.2
+
 
 - type: entity
   parent: [GunSafeBaseSecure, BaseRestrictedContraband]
@@ -216,9 +207,9 @@
   - type: StorageFill
     contents:
     - id: WeaponShotgunKammerer
-      amount: 2
+      amount: 3
     - id: BoxLethalshot
-      amount: 2
+      amount: 3
 
 - type: entity
   id: GunSafeSubMachineGunWt550
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 41a11561e80b42..118bbfb2cc9ee8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -10,7 +10,6 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVA
-        - id: ClothingMaskBreath
 
 #Basic EVA (Big Ass Helmet)
 - type: entity
@@ -23,7 +22,6 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
 
 #Emergency EVA
 - type: entity
@@ -35,7 +33,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterSuitEmergency
-        - id: ClothingMaskBreath
 
 #Prisoner EVA
 - type: entity
@@ -48,7 +45,6 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
 
 #Syndicate EVA
 - type: entity
@@ -73,7 +69,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateEVA
-        - id: ClothingMaskGas
 
 #NTSRA Voidsuit
 - type: entity
@@ -86,7 +81,6 @@
         - id: JetpackVoidFilled
         - id: ClothingOuterHardsuitAncientEVA
         - id: ClothingHeadHelmetAncient
-        - id: ClothingMaskBreath
 
 #HARDSUITS
 #Basic hardsuit
@@ -99,7 +93,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitBasic
-        - id: ClothingMaskBreath
 
 #Engineering hardsuit
 - type: entity
@@ -112,7 +105,6 @@
         - id: OxygenTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitEngineering
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -126,7 +118,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitAtmos
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Atmospherics"]]
 
@@ -140,7 +131,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSecurity
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Security"]]
 
@@ -206,7 +196,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWarden
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Armory"]]
 
@@ -247,7 +236,6 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSyndie
         - id: ClothingShoesBootsMagSyndie
-        - id: ClothingMaskGasSyndicate
 
 #Pirate Captain's hardsuit
 - type: entity
@@ -259,7 +247,6 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateCap
-        - id: ClothingMaskGas
 
 #Wizard
 - type: entity
@@ -271,4 +258,3 @@
     contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWizard
-        - id: ClothingMaskBreath
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
index a67ed9397b3d95..771b9afb4468c3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -12,6 +12,6 @@
     ClothingOuterVestDetective: 2
     ClothingNeckTieDet: 2
     ClothingHeadHatFedoraGrey: 2
+    ClothingHandsGlovesForensic: 2
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
-    ClothingHeadsetSecurity: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index afbeff6b080629..727f35ddc004fa 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -8,17 +8,14 @@
     ClusterBangFull: 2
     GrenadeStinger: 4
     Flash: 5
-    Tourniquet: 5
+    Tourniquet: 6
     FlashlightSeclite: 5
-    ClothingEyesGlassesSunglasses: 2
+    ClothingEyesGlassesSunglasses: 4
     ClothingEyesHudSecurity: 2
     ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5
-    CombatKnife: 3
+    CombatKnife: 6
     Zipties: 12
-    RiotShield: 2
-    RiotLaserShield: 2
-    RiotBulletShield: 2
     RadioHandheldSecurity: 5
   # security officers need to follow a diet regimen!
   contrabandInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index f81f5854cb4c35..8465c1c2e8e698 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -22,7 +22,6 @@
     ClothingNeckScarfStripedRed: 3
     ClothingOuterArmorBasicSlim: 2
     ClothingEyesBlindfold: 1
-    ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingHeadHelmetJustice: 1
   contrabandInventory: