diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cf0b6115af..1ba8884634 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -56437,6 +56437,7 @@ /obj/structure/curtain{ icon_state = "closed" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/surgery) "cie" = ( @@ -57088,15 +57089,15 @@ /area/maintenance/port/aft) "cjw" = ( /obj/structure/table, -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 5 }, /obj/machinery/light_switch{ pixel_x = -26 }, +/obj/machinery/vending/wallmed{ + pixel_y = 29 + }, /turf/open/floor/plasteel/white/corner, /area/medical/surgery) "cjz" = ( @@ -57114,8 +57115,8 @@ "cjB" = ( /obj/machinery/iv_drip, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/vending/wallmed{ - pixel_y = 29 +/obj/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/plasteel/white/side, /area/medical/surgery) @@ -57134,15 +57135,15 @@ /area/medical/surgery) "cjD" = ( /obj/structure/table, -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 5 }, /obj/machinery/light_switch{ pixel_x = 28 }, +/obj/machinery/vending/wallmed{ + pixel_y = 29 + }, /turf/open/floor/plasteel/white/corner{ dir = 8 }, @@ -57799,9 +57800,6 @@ dir = 4; pixel_x = 11 }, -/obj/structure/mirror{ - pixel_x = 28 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -57823,9 +57821,6 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/mirror{ - pixel_x = -28 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -58913,11 +58908,11 @@ /area/medical/surgery) "cnp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ name = "Operating Theatre"; req_access_txt = "45" }, -/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/surgery) "cnq" = ( @@ -59597,10 +59592,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, /turf/open/floor/plasteel/dark, /area/medical/surgery) "coz" = ( @@ -60457,9 +60448,6 @@ /area/medical/surgery) "cqb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Surgery Observation" - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -60473,6 +60461,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical{ + name = "Surgery Observation" + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "cqc" = ( @@ -64937,6 +64928,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = -26 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cyo" = ( @@ -65311,11 +65306,6 @@ /turf/open/floor/plasteel, /area/medical/genetics) "cze" = ( -/obj/machinery/door/airlock/research{ - id_tag = "AuxGenetics"; - name = "Genetics Access"; - req_access_txt = "9" - }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -65323,13 +65313,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + id_tag = "AuxGenetics"; + name = "Genetics Access"; + req_access_txt = "9" + }, /turf/open/floor/plasteel, /area/medical/genetics) "czf" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -26 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -81809,12 +81800,12 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "kgN" = ( -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/medical/glass{ name = "Operating Theatre"; req_access_txt = "45" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/medical/surgery) "krD" = ( @@ -82865,6 +82856,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"sos" = ( +/obj/structure/mirror, +/turf/closed/wall, +/area/medical/surgery) "sqe" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space/basic, @@ -102981,7 +102976,7 @@ cdl dwb cia cnm -cia +sos cid cnq coC