diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 13f8aae57fb..6061ddcabb4 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2376,7 +2376,7 @@ "aTJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) "aTK" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) "aTL" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) -"aTM" = (/obj/structure/closet/wardrobe/black,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/medical/morgue) +"aTM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/closet/secure_closet/coroner,/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/medical/morgue) "aTN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/medical/exam_room) "aTO" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/medical/morgue) "aTP" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/cane{pixel_x = -3; pixel_y = 3},/obj/item/weapon/cane{pixel_x = -5; pixel_y = 6},/obj/item/weapon/cane,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) 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 c0603396325..0dd97600ac7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -9,7 +9,6 @@ icon_off = "medicaloff" req_access = list(access_medical) - New() ..() new /obj/item/weapon/storage/box/autoinjectors(src) @@ -24,7 +23,6 @@ new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src) - /obj/structure/closet/secure_closet/medical2 name = "anesthetic locker" desc = "Used to knock people out." @@ -36,7 +34,6 @@ icon_off = "medicaloff" req_access = list(access_surgery) - New() ..() new /obj/item/weapon/tank/anesthetic(src) @@ -47,7 +44,6 @@ new /obj/item/clothing/mask/breath/medical(src) - /obj/structure/closet/secure_closet/medical3 name = "medical doctor's locker" req_access = list(access_surgery) @@ -75,6 +71,7 @@ new /obj/item/clothing/glasses/hud/health(src) new /obj/item/clothing/shoes/sandal/white(src) + //Exam Room /obj/structure/closet/secure_closet/exam name = "exam room closet" @@ -87,7 +84,6 @@ icon_off = "medicaloff" req_access = list(access_medical) - New() ..() new /obj/item/weapon/storage/box/syringes(src) @@ -135,6 +131,7 @@ new /obj/item/weapon/reagent_containers/glass/bottle/ether(src) new /obj/item/weapon/storage/pill_bottle/psychiatrist(src) + /obj/structure/closet/secure_closet/CMO name = "chief medical officer's locker" req_access = list(access_cmo) @@ -178,12 +175,10 @@ new /obj/item/weapon/door_remote/chief_medical_officer(src) - /obj/structure/closet/secure_closet/animal name = "animal control locker" req_access = list(access_surgery) - New() ..() new /obj/item/device/assembly/signaler(src) @@ -192,7 +187,6 @@ new /obj/item/device/radio/electropack(src) - /obj/structure/closet/secure_closet/chemical name = "chemical closet" desc = "Store dangerous chemicals in here." @@ -204,12 +198,12 @@ icon_off = "medicaloff" req_access = list(access_chemistry) - New() ..() new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/weapon/storage/box/pillbottles(src) + /obj/structure/closet/secure_closet/medical_wall name = "first aid closet" desc = "It's a secure wall-mounted storage unit for first aid supplies." @@ -247,7 +241,6 @@ icon_off = "medicaloff" req_access = list(access_paramedic) - New() ..() new /obj/item/clothing/suit/space/eva/paramedic(src) @@ -266,7 +259,6 @@ icon_off = "chemicaloff" req_access = list(access_chemistry) - New() ..() new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src) @@ -275,3 +267,29 @@ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src) new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src) new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src) + + +/obj/structure/closet/secure_closet/coroner + name = "coroner's locker" + icon_state = "securecoroner1" + icon_closed = "securecoroner" + icon_locked = "securecoroner1" + icon_opened = "securecoroneropen" + icon_broken = "securecoronerbroken" + icon_off = "securecoroneroff" + req_access = list(access_morgue) + + New() + ..() + if(prob(50)) + new /obj/item/weapon/storage/backpack/medic(src) + else + new /obj/item/weapon/storage/backpack/satchel_med(src) + new /obj/item/weapon/storage/backpack/duffel/medical(src) + new /obj/item/clothing/suit/storage/labcoat/mortician(src) + new /obj/item/device/radio/headset/headset_med(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/under/rank/medical/mortician(src) + new /obj/item/clothing/head/surgery/black(src) + new /obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde(src) + new /obj/item/weapon/reagent_containers/dropper(src) diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 20372528b02..6c5eeb22563 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ