diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
index 15fe02c5e40..1824725b833 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -2,10 +2,7 @@
 "aa" = (
 /obj/effect/turf_decal/siding/dark,
 /obj/machinery/light/cold/directional/west,
-/obj/structure/closet/secure_closet{
-	name = "prisoner item locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/prisoner_locker,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/effect/mapping_helpers/apc/syndicate_access,
 /obj/structure/cable,
@@ -16,11 +13,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "syndicate";
-	name = "MODsuit module locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/mod_locker,
 /obj/item/mod/module/stealth,
 /obj/item/mod/module/projectile_dampener{
 	pixel_x = 8;
@@ -372,11 +365,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "sec";
-	name = "brig officer gear locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
 /obj/item/clothing/mask/gas/syndicate/ds,
 /obj/item/clothing/suit/toggle/jacket/sec/old{
 	name = "brig officer jacket"
@@ -787,11 +776,7 @@
 /obj/item/gun/energy/recharge/kinetic_accelerator,
 /obj/item/storage/bag/ore,
 /obj/item/mining_scanner,
-/obj/structure/closet/secure_closet{
-	icon_state = "mining";
-	name = "mining gear locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/mining_locker,
 /obj/item/storage/belt/mining/alt,
 /obj/item/clothing/under/syndicate/skyrat/overalls{
 	pixel_y = -2
@@ -2415,11 +2400,7 @@
 	},
 /area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
 "jW" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "science";
-	name = "roboticist gear locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/robotics,
 /obj/item/clothing/suit/hooded/techpriest,
 /obj/item/clothing/suit/toggle/labcoat/roboticist{
 	pixel_y = 3
@@ -2676,11 +2657,7 @@
 /obj/item/card/id/advanced/chameleon/black,
 /obj/item/card/id/advanced/chameleon/black,
 /obj/item/card/id/advanced/chameleon/black,
-/obj/structure/closet/secure_closet{
-	icon_state = "hop";
-	name = "\proper corporate liaison's locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/cl_locker,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
@@ -4977,11 +4954,7 @@
 /turf/open/floor/wood/large,
 /area/ruin/space/has_grav/skyrat/interdynefob/bridge/cl)
 "vx" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "cap";
-	name = "\proper station admiral's locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/sa_locker,
 /obj/item/clothing/head/hats/hos/cap/syndicate,
 /obj/item/clothing/head/hats/hos/beret/syndicate,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
@@ -5520,10 +5493,7 @@
 /area/ruin/space/has_grav/skyrat/interdynefob/bridge)
 "yL" = (
 /obj/effect/turf_decal/siding/dark,
-/obj/structure/closet/secure_closet{
-	name = "prisoner item locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/prisoner_locker,
 /obj/item/restraints/handcuffs,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/skyrat/interdynefob/security)
@@ -5995,13 +5965,7 @@
 	pixel_x = -9;
 	pixel_y = -5
 	},
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi';
-	icon_state = "riot";
-	name = "armory munitions locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker,
 /obj/effect/turf_decal/siding/dark{
 	dir = 8
 	},
@@ -7050,11 +7014,7 @@
 /turf/open/floor/iron/white/diagonal,
 /area/ruin/space/has_grav/skyrat/interdynefob/service/hydroponics)
 "FO" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "med_secure";
-	name = "medical gear locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/medical,
 /obj/item/clothing/gloves/latex/nitrile/ntrauma,
 /obj/item/clothing/suit/toggle/labcoat/interdyne,
 /obj/item/clothing/suit/toggle/labcoat/interdyne,
@@ -7847,11 +7807,7 @@
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/ruin/space/has_grav/skyrat/interdynefob/cargo)
 "JD" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "warden";
-	name = "master at arms' locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/maa_locker,
 /obj/item/storage/belt/security/full,
 /obj/item/radio/headset/interdyne,
 /obj/item/clothing/suit/armor/vest/warden/syndicate,
@@ -8241,12 +8197,7 @@
 /obj/effect/turf_decal/trimline/yellow/line{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_door = "eng_weld";
-	icon_state = "eng";
-	name = "welding supplies locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/electrical_supplies,
 /obj/item/weldingtool/largetank{
 	pixel_y = 4
 	},
@@ -8314,13 +8265,7 @@
 	pixel_x = 6;
 	pixel_y = -11
 	},
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi';
-	icon_state = "riot";
-	name = "armory gear locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
 "Lw" = (
@@ -8859,11 +8804,7 @@
 	desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
 	name = "brig officer armband"
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "sec";
-	name = "brig officer gear locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
 /obj/item/clothing/mask/gas/syndicate/ds,
 /obj/item/clothing/suit/toggle/jacket/sec/old{
 	name = "brig officer jacket"
@@ -9068,11 +9009,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "sec";
-	name = "brig officer gear locker";
-	req_access = list("syndicate_leader")
-	},
+/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
 /obj/item/clothing/mask/gas/syndicate/ds,
 /obj/item/clothing/suit/toggle/jacket/sec/old{
 	name = "brig officer jacket"
@@ -9275,11 +9212,7 @@
 	dir = 1
 	},
 /obj/machinery/light/cold/directional/north,
-/obj/structure/closet/secure_closet{
-	icon_state = "science";
-	name = "scientist gear locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/science_gear,
 /obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate,
 /obj/item/clothing/suit/hooded/wintercoat/science,
 /obj/item/clothing/suit/toggle/labcoat/science,
@@ -10294,11 +10227,7 @@
 /obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/syndicate,
 /obj/item/clothing/suit/jacket/gorlex_harness,
 /obj/item/clothing/suit/hazardvest,
-/obj/structure/closet/secure_closet{
-	icon_state = "eng_secure";
-	name = "engine technician gear locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/engie_locker,
 /obj/item/clothing/accessory/armband/engine{
 	desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
 	name = "engine technician armband"
@@ -11162,12 +11091,7 @@
 /obj/effect/turf_decal/trimline/yellow/line{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet{
-	icon_door = "eng_elec";
-	icon_state = "eng";
-	name = "electrical supplies locker";
-	req_access = list("syndicate")
-	},
+/obj/structure/closet/secure_closet/interdynefob/electrical_supplies,
 /obj/item/electronics/airlock{
 	pixel_x = 5;
 	pixel_y = -7
diff --git a/modular_skyrat/modules/mapping/code/lockers/interdynefob_lockers.dm b/modular_skyrat/modules/mapping/code/lockers/interdynefob_lockers.dm
new file mode 100644
index 00000000000..b52c9b60647
--- /dev/null
+++ b/modular_skyrat/modules/mapping/code/lockers/interdynefob_lockers.dm
@@ -0,0 +1,92 @@
+// Lockers used in interdynefob.dmm
+
+// Parent type since most of the lockers required syndicate access
+/obj/structure/closet/secure_closet/interdynefob
+	req_access = list("syndicate")
+
+// Generic lockers/subtypes
+/obj/structure/closet/secure_closet/personal
+	icon_door = "cabinet"
+	icon_state = "cabinet"
+
+// Job-specific lockers
+/obj/structure/closet/secure_closet/interdynefob/science_gear
+	icon_state = "science"
+	name = "scientist gear locker"
+
+/obj/structure/closet/secure_closet/interdynefob/robotics
+	icon_state = "science"
+	name = "roboticist gear locker"
+
+/obj/structure/closet/secure_closet/interdynefob/medical
+	icon_state = "med_secure"
+	name = "medical gear locker"
+
+/obj/structure/closet/secure_closet/interdynefob/welding_supplies
+	icon_door = "eng_weld"
+	icon_state = "eng"
+	name = "welding supplies locker"
+
+/obj/structure/closet/secure_closet/interdynefob/electrical_supplies
+	icon_door = "eng_elec"
+	icon_state = "eng"
+	name = "electrical supplies locker"
+
+/obj/structure/closet/secure_closet/interdynefob/engie_locker
+	icon_door = "eng_secure"
+	icon_state = "eng_secure"
+	name = "engine technician gear locker"
+
+/obj/structure/closet/secure_closet/interdynefob/mining_locker
+	icon_door = "mining"
+	icon_state = "mining"
+	name = "mining gear locker"
+
+/obj/structure/closet/secure_closet/interdynefob/sa_locker
+	icon_door = "cap"
+	icon_state = "cap"
+	name = "\proper station admiral's locker"
+
+/obj/structure/closet/secure_closet/interdynefob/munitions_locker
+	anchored = 1;
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
+	icon_door = "riot"
+	icon_state = "riot"
+	name = "armory munitions locker"
+
+// Heads lockers
+/obj/structure/closet/secure_closet/interdynefob/maa_locker
+	icon_door = "warden"
+	icon_state = "warden"
+	name = "master at arms' locker"
+	req_access = list("syndicate_leader")
+
+/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker
+	anchored = 1
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
+	icon_door = "riot"
+	icon_state = "riot"
+	name = "armory gear locker"
+	req_access = list("syndicate_leader")
+
+/obj/structure/closet/secure_closet/interdynefob/prisoner_locker
+	name = "prisoner item locker"
+	req_access = list("syndicate_leader")
+
+/obj/structure/closet/secure_closet/interdynefob/mod_locker
+	icon_door = "syndicate"
+	icon_state = "syndicate"
+	name = "MODsuit module locker"
+	req_access = list("syndicate_leader")
+
+/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker
+	icon_door = "sec"
+	icon_state = "sec"
+	name = "brig officer gear locker"
+	req_access = list("syndicate_leader")
+
+/obj/structure/closet/secure_closet/interdynefob/cl_locker
+	icon_door = "hop"
+	icon_state = "hop"
+	name = "\proper corporate liaison's locker"
+	req_access = list("syndicate_leader")
diff --git a/tgstation.dme b/tgstation.dme
index 388fb68fa4b..cc8da0ec85e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6499,6 +6499,7 @@
 #include "modular_skyrat\modules\mapping\code\areas\shuttles.dm"
 #include "modular_skyrat\modules\mapping\code\areas\space.dm"
 #include "modular_skyrat\modules\mapping\code\areas\station.dm"
+#include "modular_skyrat\modules\mapping\code\lockers\interdynefob_lockers.dm"
 #include "modular_skyrat\modules\mapping\voidraptor\code\areas.dm"
 #include "modular_skyrat\modules\mapping\voidraptor\code\clothing.dm"
 #include "modular_skyrat\modules\mapping\voidraptor\code\mob.dm"