diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index b78e75d64f7..1bd0baab9b6 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -10264,8 +10264,6 @@ /area/station/hallway/primary/fore) "aKB" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/restraints/handcuffs, -/obj/item/flash, /turf/simulated/floor/carpet/grimey, /area/station/security/detective) "aKC" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 6a0d58c030c..87f5679ad0c 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -13245,8 +13245,6 @@ /area/station/engineering/smes) "bPO" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/flash, -/obj/item/restraints/handcuffs, /obj/item/radio/intercom{ name = "east bump"; pixel_x = 28 diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 700c9d695b0..53e41aa5b64 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -100945,9 +100945,6 @@ /area/station/maintenance/starboard) "tYT" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/restraints/handcuffs, -/obj/item/flash, -/obj/item/clothing/gloves/color/latex, /obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/station/security/detective) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index fbd3aec891b..602a9f0d919 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -546,10 +546,7 @@ /area/station/engineering/solar/fore_port) "agY" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/restraints/handcuffs, -/obj/item/flash, /obj/machinery/alarm/directional/south, -/obj/item/reagent_containers/drinks/flask/detflask, /turf/simulated/floor/carpet/grimey, /area/station/security/detective) "ahd" = ( diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index 5776d1262a0..bae196daa8d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -189,19 +189,23 @@ close_sound = 'sound/machines/wooden_closet_close.ogg' /obj/structure/closet/secure_closet/detective/populate_contents() + new /obj/effect/spawner/detgun(src) + new /obj/item/ammo_box/magazine/detective/speedcharger(src) + new /obj/item/ammo_box/magazine/detective/speedcharger(src) + new /obj/item/clipboard(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/detective_scanner(src) + new /obj/item/flash(src) + new /obj/item/flashlight/seclite(src) + new /obj/item/holosign_creator/detective(src) + new /obj/item/radio/headset/headset_sec/alt(src) + new /obj/item/reagent_containers/drinks/flask/detflask(src) + new /obj/item/restraints/handcuffs(src) new /obj/item/storage/bag/garment/detective(src) new /obj/item/storage/belt/security(src) new /obj/item/storage/box/evidence(src) - new /obj/item/clipboard(src) - new /obj/item/radio/headset/headset_sec/alt(src) - new /obj/item/detective_scanner(src) - new /obj/item/ammo_box/magazine/detective/speedcharger(src) - new /obj/item/ammo_box/magazine/detective/speedcharger(src) - new /obj/effect/spawner/detgun(src) - new /obj/item/flashlight/seclite(src) - new /obj/item/holosign_creator/detective(src) - new /obj/item/taperecorder(src) new /obj/item/storage/box/tapes(src) + new /obj/item/taperecorder(src) /obj/structure/closet/secure_closet/injection name = "lethal injections locker"