diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index a0f17e0e37..229f12ab83 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -17,3 +17,25 @@
         prob: 0.8
       - id: SurvivalKnife
       - id: WeaponProtoKineticAccelerator
+
+- type: entity
+  id: LockerCargoTechnicianFilled
+  suffix: Filled
+  parent: LockerCargoTechnician
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHatCargosoft
+        amount: 1
+      - id: ClothingUniformJumpsuitCargo
+        amount: 1
+      - id: ClothingBackpack
+        amount: 1
+      - id: ClothingShoesColorBlack
+        amount: 1
+      - id: ClothingUniformJumpskirtCargo
+        amount: 1
+      - id: ClothingHandsGlovesFingerless
+        amount: 1
+      - id: AppraisalTool
+        amount: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 2f394b2b11..c766545b79 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -56,6 +56,7 @@
       - id: ForensicScanner
       - id: BoxForensicPad
       - id: WeaponRevolverInspector
+      - id: DrinkDetFlask
 
 - type: entity
   id: ClosetBombFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 1dc922409e..730868d673 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -15,6 +15,8 @@
         prob: 0.5
       - id: DrinkBottleBeer
         prob: 0.5
+      - id: BoxBeanbag
+        amount: 2
 
 #- type: entity
 #  id: LockerFormalFilled
@@ -53,6 +55,7 @@
   - type: StorageFill
     contents:
       - id: MopItem
+        amount: 2
       - id: BoxMousetrap
         amount: 2
       - id: WetFloorSign
@@ -63,6 +66,12 @@
         amount: 1
       - id: BoxLightMixed
         amount: 1
+      - id: Holoprojector
+        amount: 1
+      - id: SoapNT
+        amount: 2
+      - id: FlashlightLantern
+        amount: 2
 
 - type: entity
   id: ClosetLegalFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index bb83066548..d64c3e681e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -12,4 +12,3 @@
     ClothingOuterVestKevlar: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
-    BoxBeanbag: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
index c745865622..0584bf510b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: CargoDrobeInventory
   startingInventory:
-    AppraisalTool: 3
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
     ClothingShoesColorBlack: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
index ba5fd7fcec..f45dd229a2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -13,5 +13,4 @@
     ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
-    DrinkDetFlask: 2
     ClothingHeadsetSecurity: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
index d8cf14b343..0a73287c60 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -11,6 +11,5 @@
     ClothingOuterVestHazard: 3
     ClothingShoesBootsWork: 3
     ClothingHeadHatHardhatYellow: 3
-    ClothingHeadHatWelding: 3
     ClothingHeadsetEngineering: 3
     ClothingOuterWinterEngi: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
index 23f320a77e..aa90994486 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -2,7 +2,7 @@
   id: EngiVendInventory
   startingInventory:
     ClothingEyesGlassesMeson: 4
-    ClothingHeadHatWelding: 4
+    ClothingHeadHatWelding: 6
     Multitool: 4
     PowerCellMedium: 5
     ClothingHandsGlovesColorYellow: 6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index 9d50fec845..b6160f7cb3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -5,14 +5,10 @@
     ClothingUniformJumpskirtJanitor: 2
     ClothingShoesColorBlack: 2
     ClothingHeadHatPurplesoft: 2
-    FlashlightLantern: 2
-    LightReplacer: 2
-    SoapNT: 2
-    TrashBag: 2
     ClothingShoesGaloshes: 2
     ClothingBeltJanitor: 2
     ClothingHeadsetService: 2
     ClothingOuterWinterJani: 2
-    Holoprojector: 1
+
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 6e1bfd514a..cc60b61ad1 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -49,6 +49,21 @@
   - type: AccessReader
     access: [["Salvage"]]
 
+- type: entity
+  id: LockerCargoTechnician
+  parent: LockerBase
+  name: cargo technician's equipment
+  description: All the basics for a Cargonian resident.
+  components:
+    - type: Appearance
+      visuals:
+      - type: StorageVisualizer
+        state: cargo
+        state_open: cargo_open
+        state_closed: cargo_door
+    - type: AccessReader
+      access: [["Cargo"]]
+
 # Command
 - type: entity
   id: LockerCaptain