diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 9776dfc5f84..bcbd38a6dd4 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -38544,16 +38544,15 @@ }, /area/station/legal/magistrate) "ccL" = ( -/obj/structure/closet, /obj/machinery/light/small{ dir = 8 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "ccM" = ( -/obj/structure/closet, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -38563,6 +38562,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38588,7 +38588,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "ccP" = ( -/obj/structure/closet, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39760,7 +39760,6 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgg" = ( -/obj/structure/closet, /obj/machinery/alarm{ name = "north bump"; pixel_y = 24 @@ -39771,6 +39770,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39837,11 +39837,11 @@ }, /area/station/security/brig) "cgo" = ( -/obj/structure/closet, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39865,12 +39865,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/closet, /obj/machinery/light_switch{ dir = 1; name = "south bump"; pixel_y = -24 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91027,10 +91027,10 @@ }, /area/station/medical/virology) "spP" = ( -/obj/structure/closet, /obj/machinery/light/small{ dir = 4 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 507c18da9f0..c1f72cd0b5a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1538,9 +1538,6 @@ /turf/simulated/wall/r_wall, /area/station/security/brig) "amI" = ( -/obj/structure/closet{ - name = "Evidence Closet 3" - }, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -1556,6 +1553,7 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -2433,12 +2431,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aqQ" = ( -/obj/structure/closet{ - name = "Evidence Closet 1" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -38049,9 +38045,6 @@ }, /area/station/engineering/gravitygenerator) "cAJ" = ( -/obj/structure/closet{ - name = "Evidence Closet 2" - }, /obj/machinery/alarm{ dir = 4; name = "west bump"; @@ -38063,6 +38056,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -54749,16 +54743,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gRF" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Evidence Storage"; - req_access_txt = "4" - }, /obj/structure/cable/yellow, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 }, +/obj/structure/closet/secure_closet/evidence/detective, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -63314,10 +63304,6 @@ /obj/machinery/camera{ c_tag = "Evidence Storage" }, -/obj/item/storage/secure/safe{ - name = "evidence safe"; - pixel_y = 32 - }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -83208,13 +83194,11 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "sNG" = ( -/obj/structure/closet{ - name = "Evidence Closet 4" - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -89740,9 +89724,6 @@ }, /area/station/science/rnd) "vJo" = ( -/obj/structure/closet{ - name = "Evidence Closet 5" - }, /obj/machinery/firealarm{ dir = 4; name = "east bump"; @@ -89752,6 +89733,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -95182,19 +95164,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"yev" = ( -/obj/structure/closet{ - name = "Evidence Closet 6" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkred" - }, -/area/station/security/evidence) "yew" = ( /obj/structure/girder, /obj/item/stack/sheet/metal, @@ -121766,7 +121735,7 @@ kli abW abq tsn -yev +sNG vJo sNG rZA diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 4dcf39e6f4c..dc8d359a8cb 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -5482,10 +5482,10 @@ /turf/simulated/floor/plating, /area/station/supply/miningdock) "aJz" = ( -/obj/structure/closet, /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -11185,7 +11185,6 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/starboard) "bnv" = ( -/obj/structure/closet, /obj/structure/window/reinforced{ dir = 4 }, @@ -11193,17 +11192,18 @@ pixel_y = -28; name = "custom placement" }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "bnw" = ( -/obj/structure/closet, /obj/machinery/light_switch{ dir = 1; pixel_y = -24; name = "south bump" }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32611,7 +32611,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "duk" = ( -/obj/structure/closet, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -50234,11 +50234,11 @@ }, /area/station/hallway/secondary/exit) "jcx" = ( -/obj/structure/closet, /obj/machinery/alarm{ pixel_y = 24; name = "north bump" }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 91d418f1aef..bf3c2b74c06 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -3099,11 +3099,11 @@ }, /area/station/security/prison/cell_block/A) "alS" = ( -/obj/structure/closet, /obj/item/radio/intercom{ name = "west bump"; pixel_x = -28 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3121,17 +3121,17 @@ }, /area/station/security/armory/secure) "ama" = ( -/obj/structure/closet, /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "amb" = ( -/obj/structure/closet, /obj/effect/decal/cleanable/cobweb2, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4262,7 +4262,6 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "apd" = ( -/obj/structure/closet, /obj/machinery/alarm{ dir = 4; name = "west bump"; @@ -4271,6 +4270,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6192,7 +6192,7 @@ }, /area/station/security/lobby) "auI" = ( -/obj/structure/closet, +/obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -11122,14 +11122,10 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Evidence Storage"; - req_access_txt = "4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/closet/secure_closet/evidence/detective, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, 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 d341e859856..4affb212385 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 @@ -112,6 +112,14 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/suit/armor/secjacket(src) +/obj/structure/closet/secure_closet/evidence + name = "evidence locker" + req_access = list(ACCESS_SEC_DOORS) + anchored = TRUE + +/obj/structure/closet/secure_closet/evidence/detective + req_access = list(ACCESS_FORENSICS_LOCKERS) + /obj/structure/closet/secure_closet/blueshield name = "blueshield's locker" req_access = list(ACCESS_BLUESHIELD)