diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
index cd793d2c7c..dab5b0d4bf 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
@@ -10,3 +10,11 @@
 
   - type: Icon
     state: cabinet_door
+
+
+# LockerBooze Filled
+- type: entity
+  id: LockerBoozeFilled
+  suffix: Filled
+  parent: LockerBooze
+
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
index bca7e220b4..9fffb51618 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
@@ -11,3 +11,9 @@
 
   - type: Icon
     state: qm_door
+
+# LockerQuarterMaster Filled
+- type: entity
+  id: LockerQuarterMasterFilled
+  suffix: Filled
+  parent: LockerQuarterMaster
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
index 1c9f02edd0..9fcae278e7 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
@@ -25,3 +25,16 @@
 
   - type: Icon
     state: hop_door
+
+
+# LockerCaptain Filled
+- type: entity
+  id: LockerCaptainFilled
+  suffix: Filled
+  parent: LockerCaptain
+
+# LockerHeadOfPersonnel Filled
+- type: entity
+  id: LockerHeadOfPersonnelFilled
+  suffix: Filled
+  parent: LockerHeadOfPersonnel
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
index 9dd702d7ea..da9de55482 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
@@ -69,3 +69,34 @@
 
   - type: Icon
     state: eng_secure_door
+
+
+# LockerChiefEngineer Filled
+- type: entity
+  id: LockerChiefEngineerFilled
+  suffix: Filled
+  parent: LockerChiefEngineer
+
+# LockerElectricalSupplies Filled
+- type: entity
+  id: LockerElectricalSuppliesFilled
+  suffix: Filled
+  parent: LockerElectricalSupplies
+
+# LockerWeldingSupplies Filled
+- type: entity
+  id: LockerWeldingSuppliesFilled
+  suffix: Filled
+  parent: LockerWeldingSupplies
+
+# LockerAtmospherics Filled
+- type: entity
+  id: LockerAtmosphericsFilled
+  suffix: Filled
+  parent: LockerAtmospherics
+
+# LockerEngineer Filled
+- type: entity
+  id: LockerEngineerFilled
+  suffix: Filled
+  parent: LockerEngineer
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
index d05c368217..899a3f5add 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
@@ -10,3 +10,10 @@
 
   - type: Icon
     state: hydro_door
+
+
+# LockerBotanist Filled
+- type: entity
+  id: LockerBotanistFilled
+  suffix: Filled
+  parent: LockerBotanist
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
index 608e1ccec0..81828589b4 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
@@ -55,3 +55,28 @@
 
   - type: Icon
     state: cmo_door
+
+
+# LockerMedicine Filled
+- type: entity
+  id: LockerMedicineFilled
+  suffix: Filled
+  parent: LockerMedicine
+
+# LockerMedical Filled
+- type: entity
+  id: LockerMedicalFilled
+  suffix: Filled
+  parent: LockerMedical
+
+# LockerChemistry Filled
+- type: entity
+  id: LockerChemistryFilled
+  suffix: Filled
+  parent: LockerChemistry
+
+# LockerChiefMedicalOfficer Filled
+- type: entity
+  id: LockerChiefMedicalOfficerFilled
+  suffix: Filled
+  parent: LockerChiefMedicalOfficer
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
index d0efafdb2b..be2181ff49 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
@@ -10,3 +10,11 @@
 
   - type: Icon
     state: rd_door
+
+
+# LockerResearchDirector Filled
+- type: entity
+  id: LockerResearchDirectorFilled
+  suffix: Filled
+  parent: LockerResearchDirector
+
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
index 234ef2250a..a2a9e0a2ec 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
@@ -39,3 +39,21 @@
 
   - type: Icon
     state: sec_door
+
+# LockerHeadOfSecurity Filled
+- type: entity
+  id: LockerHeadOfSecurityFilled
+  suffix: Filled
+  parent: LockerHeadOfSecurity
+
+# LockerWarden Filled
+- type: entity
+  id: LockerWardenFilled
+  suffix: Filled
+  parent: LockerWarden
+
+# LockerSecurity Filled
+- type: entity
+  id: LockerSecurityFilled
+  suffix: Filled
+  parent: LockerSecurity
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
index 3d7260c06a..4cf72def1b 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
@@ -116,3 +116,100 @@
   id: WardrobeBotanist
   parent: WardrobeGreen
   name: "botanist wardrobe"
+
+
+# LockerFormal Filled
+- type: entity
+  id: LockerFormalFilled
+  suffix: Filled
+  parent: LockerFormal
+
+# LockerChef Filled
+- type: entity
+  id: LockerChefFilled
+  suffix: Filled
+  parent: LockerChef
+
+# LockerJanitor Filled
+- type: entity
+  id: LockerJanitorFilled
+  suffix: Filled
+  parent: LockerJanitor
+
+# LockerLegal Filled
+- type: entity
+  id: LockerLegalFilled
+  suffix: Filled
+  parent: LockerLegal
+
+# WardrobeChapel Filled
+- type: entity
+  id: WardrobeChapelFilled
+  suffix: Filled
+  parent: WardrobeChapel
+
+# WardrobeSecurity Filled
+- type: entity
+  id: WardrobeSecurityFilled
+  suffix: Filled
+  parent: WardrobeSecurity
+
+# WardrobeCargo Filled
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+
+# WardrobeAtmospherics Filled
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+
+# WardrobeEngineering Filled
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
+
+# WardrobeMedicalDoctor Filled
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+
+# WardrobeRobotics Filled
+- type: entity
+  id: WardrobeRoboticsFilled
+  suffix: Filled
+  parent: WardrobeRobotics
+
+# WardrobeChemistry Filled
+- type: entity
+  id: WardrobeChemistryFilled
+  suffix: Filled
+  parent: WardrobeChemistry
+
+# WardrobeGenetics Filled
+- type: entity
+  id: WardrobeGeneticsFilled
+  suffix: Filled
+  parent: WardrobeGenetics
+
+# WardrobeVirology Filled
+- type: entity
+  id: WardrobeVirologyFilled
+  suffix: Filled
+  parent: WardrobeVirology
+
+# WardrobeScience Filled
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+
+# WardrobeBotanist Filled
+- type: entity
+  id: WardrobeBotanistFilled
+  suffix: Filled
+  parent: WardrobeBotanist
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
index 491f3f66b5..48c6e7bcec 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
@@ -51,3 +51,34 @@
 
   - type: Icon
     state: bio_jan_door
+
+
+# LockerL3 Filled
+- type: entity
+  id: LockerL3Filled
+  suffix: Filled, Generic
+  parent: LockerL3
+
+# LockerL3Virology Filled
+- type: entity
+  id: LockerL3VirologyFilled
+  suffix: Filled, Virology
+  parent: LockerL3Virology
+
+# LockerL3Security Filled
+- type: entity
+  id: LockerL3SecurityFilled
+  suffix: Filled, Security
+  parent: LockerL3Security
+
+# LockerL3Janitor Filled
+- type: entity
+  id: LockerL3JanitorFilled
+  suffix: Filled, Janitor
+  parent: LockerL3Janitor
+
+# LockerL3Science Filled
+- type: entity
+  id: LockerL3JanitorFilled
+  suffix: Filled, Science
+  parent: LockerL3Virology
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
index e4ba874770..80305400e2 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
@@ -20,3 +20,8 @@
   description: "It's a personal storage unit for operative gear."
 
 
+# LockerSyndicatePersonal Filled
+- type: entity
+  id: LockerSyndicatePersonalFilled
+  suffix: Filled
+  parent: LockerSyndicatePersonal
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
index 5428259567..f5274f4da4 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
+++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
@@ -153,3 +153,64 @@
 
   - type: Icon
     state: mixed_door
+
+
+# WardrobeBlue Filled
+- type: entity
+  id: WardrobeBlueFilled
+  suffix: Filled
+  parent: WardrobeBlue
+
+# WardrobePink Filled
+- type: entity
+  id: WardrobePinkFilled
+  suffix: Filled
+  parent: WardrobePink
+
+# WardrobeBlack Filled
+- type: entity
+  id: WardrobeBlackFilled
+  suffix: Filled
+  parent: WardrobeBlack
+
+# WardrobeGreen Filled
+- type: entity
+  id: WardrobeGreenFilled
+  suffix: Filled
+  parent: WardrobeGreen
+
+# WardrobePrison Filled
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+
+# WardrobeYellow Filled
+- type: entity
+  id: WardrobeYellowFilled
+  suffix: Filled
+  parent: WardrobeYellow
+
+# WardrobeWhite Filled
+- type: entity
+  id: WardrobeWhiteFilled
+  suffix: Filled
+  parent: WardrobeWhite
+
+# WardrobePajama Filled
+- type: entity
+  id: WardrobePajamaFilled
+  suffix: Filled
+  parent: WardrobePajama
+
+# WardrobeGrey Filled
+- type: entity
+  id: WardrobeGreyFilled
+  suffix: Filled
+  parent: WardrobeGrey
+
+# WardrobeMixed Filled
+- type: entity
+  id: WardrobeMixedFilled
+  suffix: Filled
+  parent: WardrobeMixed