diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e03b644dd33..d9ea6b5bee2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -55361,12 +55361,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, /obj/machinery/status_display/evac{ pixel_x = 32 }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, /area/medical/psychology) "wJU" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a64113dcc00..e5aad59ab93 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -90011,9 +90011,7 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, /area/medical/psychology) "dkL" = ( diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index b9ea10152a1..536eeaae5c6 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -48570,9 +48570,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, /area/medical/psychology) "mlN" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3da08a5a715..b6acacbb25a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -25432,9 +25432,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/showroomfloor, /area/medical/psychology) "aOm" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8350192835d..b445953bc99 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -59083,13 +59083,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, /obj/machinery/status_display/evac{ pixel_x = -32; req_access_txt = "70" }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, /area/medical/psychology) "cGI" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index d7e99381e3b..a2ce5671759 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -50200,13 +50200,11 @@ /area/library/artgallery) "fIn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/closet/secure_closet{ - req_access_txt = "70" - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, /area/medical/psychology) "fIN" = ( diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a3e6c985fb8..4635dfbe846 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -44,6 +44,28 @@ new /obj/item/clothing/glasses/hud/health(src) return +/obj/structure/closet/secure_closet/psychology + name = "psychology locker" + req_access = list(ACCESS_PSYCHOLOGY) + icon_state = "cabinet" + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 + +/obj/structure/closet/secure_closet/psychology/PopulateContents() + ..() + new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/suit/black/skirt(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/storage/backpack/medic(src) + new /obj/item/radio/headset/headset_srvmed(src) + new /obj/item/clipboard(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/ears/earmuffs(src) + new /obj/item/clothing/mask/muzzle(src) + new /obj/item/clothing/glasses/blindfold(src) + /obj/structure/closet/secure_closet/CMO name = "\proper chief medical officer's locker" req_access = list(ACCESS_CMO)