diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f17eb327158..e82eb96f784 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -45692,7 +45692,8 @@ dir = 4 }, /obj/machinery/airalarm{ - pixel_y = 24 + dir = 4; + pixel_x = -22 }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -46178,14 +46179,6 @@ /obj/structure/table, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"caj" = ( -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC" - }, -/turf/closed/wall, -/area/security/checkpoint/medical) "cak" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -47076,24 +47069,24 @@ dir = 4; network = list("ss13","medbay") }, -/obj/structure/chair/greyscale, /obj/item/radio/intercom{ pixel_x = -28 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, +/obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cbS" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /turf/open/floor/plating, /area/security/checkpoint/medical) "cbT" = ( @@ -47809,55 +47802,26 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cdw" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = -29 - }, /obj/machinery/computer/med_data{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/checkpoint/medical) -"cdx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 4; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_x = -32 }, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/turf/open/floor/plasteel, +/area/security/checkpoint/medical) "cdy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cdz" = ( @@ -48251,6 +48215,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "ceB" = ( @@ -48849,44 +48817,13 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cfP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/medical_kiosk, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cfQ" = ( -/obj/structure/cable, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/grass, -/area/security/checkpoint/medical) -"cfR" = ( -/obj/structure/cable, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sunnybush, -/turf/open/floor/grass, -/area/security/checkpoint/medical) "cfT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -49386,32 +49323,13 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cgX" = ( -/obj/structure/chair/greyscale, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"cgY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/chair/greyscale, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cgZ" = ( @@ -49420,17 +49338,15 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cha" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sink{ dir = 8; pixel_x = 12 @@ -49438,12 +49354,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -50063,10 +49979,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -50082,50 +49994,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cir" = ( -/obj/machinery/atmospherics/pipe/manifold/supply, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"cit" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "ciu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -50713,29 +50588,16 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cjR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cjS" = ( @@ -51348,34 +51210,21 @@ /turf/open/floor/plating, /area/medical/medbay/central) "clo" = ( -/obj/structure/chair/greyscale{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clp" = ( /obj/structure/table, /obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/item/storage/firstaid/regular{ pixel_x = 4; pixel_y = 4 @@ -51385,6 +51234,10 @@ pixel_x = -4; pixel_y = -4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clq" = ( @@ -51393,28 +51246,19 @@ pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clr" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -70951,15 +70795,11 @@ /obj/structure/sign/warning/nosmoking{ pixel_y = 28 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -72576,6 +72416,16 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"hcZ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "hdb" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -74363,6 +74213,14 @@ }, /turf/open/floor/plasteel/dark/corner, /area/engine/storage_shared) +"oEO" = ( +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC" + }, +/turf/closed/wall, +/area/medical/storage) "oFI" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -74579,6 +74437,14 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) +"ppb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "ppz" = ( /obj/machinery/vending/boozeomat/all_access, /obj/effect/decal/cleanable/cobweb, @@ -75191,6 +75057,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"rMv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "rOP" = ( /obj/structure/sign/poster/official/random, /turf/closed/wall, @@ -75525,6 +75398,12 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) +"sWn" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "tay" = ( /turf/closed/wall, /area/medical/medbay/central) @@ -75632,6 +75511,13 @@ /obj/machinery/pinpointer_dispenser, /turf/open/floor/plating, /area/quartermaster/sorting) +"tut" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "twp" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -76445,6 +76331,19 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/department/science) +"wSP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1; + external_pressure_bound = 140; + name = "server vent"; + pressure_checks = 0 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "wYq" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -100272,7 +100171,7 @@ cad cbP cdv cez -bXK +oEO tay cio cjO @@ -100526,7 +100425,7 @@ bWj bXL bXL cae -caj +bXL bXL bXL bXL @@ -100786,11 +100685,11 @@ rVd cbQ cdw ceA -cfQ +cbS cgX -cip -cjQ -clo +sWn +wSP +hcZ cmv cnE coQ @@ -101043,10 +100942,10 @@ cag caf caf ceB -cfR -cgY -cir -cdx +cbS +cgX +cbY +tut cfP cmv cnF @@ -101302,7 +101201,7 @@ cbS cbS bXL dwy -cip +cbY cdy clp cmu @@ -101559,8 +101458,8 @@ cal ceD cfT cgZ -cit -cjQ +rMv +ppb clq cmu cmu