From 81d7e1b4019114bf17be750c6380489e9859ab1d Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:08:04 -0500 Subject: [PATCH] fuck medbay --- .../AsteroidStation/AsteroidStation.dmm | 155 +++---- _maps/map_files/GaxStation/GaxStation.dmm | 174 +++----- _maps/map_files/IceMeta/IceMeta.dmm | 412 ++++++++---------- _maps/map_files/YogStation/YogStation.dmm | 179 +++----- 4 files changed, 373 insertions(+), 547 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 49edb41b6778..3229419ad5c5 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -2973,6 +2973,18 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"aAi" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2"; + tag = "" + }, +/obj/effect/turf_decal/trimline/yellow/warning/lower, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "aAm" = ( /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 @@ -10318,13 +10330,6 @@ name = "Ice Sheet" }, /area/space/nearstation) -"cwk" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "cwB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -12020,19 +12025,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/security/armory) -"cZd" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/camera{ - c_tag = "Medbay Treatment Center"; - dir = 8; - network = list("ss13","medbay"); - pixel_x = 0 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "cZi" = ( /obj/structure/cable{ icon_state = "1-8" @@ -17804,21 +17796,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/hfr) -"eML" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2"; - tag = "" - }, -/obj/effect/turf_decal/trimline/yellow/warning/lower, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "eNk" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -18559,12 +18536,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"eYl" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "eYm" = ( /obj/machinery/light{ dir = 1 @@ -22665,12 +22636,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"gtt" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "gtC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -30645,12 +30610,6 @@ /obj/item/toy/dummy, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) -"iTG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "iTS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -48330,6 +48289,12 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"oxF" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "oyn" = ( /obj/machinery/door/airlock{ name = "Hydroponics Maintenance"; @@ -48433,20 +48398,6 @@ }, /turf/open/floor/engine, /area/escapepodbay) -"ozT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2"; - tag = "" - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "oAu" = ( /obj/structure/cable{ icon_state = "2-4" @@ -49515,12 +49466,6 @@ /obj/machinery/light, /turf/open/floor/carpet/royalblack, /area/bridge/meeting_room) -"oOs" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "oOA" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -51047,6 +50992,17 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"pnY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2"; + tag = "" + }, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "poj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -52060,6 +52016,16 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/medbay/lobby) +"pCk" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/camera{ + c_tag = "Medbay Treatment Center"; + dir = 8; + network = list("ss13","medbay"); + pixel_x = 0 + }, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "pCL" = ( /obj/machinery/deepfryer, /turf/open/floor/plasteel{ @@ -54467,6 +54433,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"qql" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + light_color = "#c1caff" + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "qqw" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/miner/oxygen, @@ -58357,19 +58333,6 @@ icon_state = "cafeteria" }, /area/crew_quarters/kitchen) -"rCs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ - light_color = "#c1caff" - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) "rCy" = ( /obj/structure/window/reinforced{ dir = 4 @@ -108032,8 +107995,8 @@ xLW brj oxg uKg -iTG -gtt +kXV +oxF aPk osd pey @@ -108289,8 +108252,8 @@ aNb qgE oxg uKg -eYl -oOs +kXV +oxF aPk rmQ aQo @@ -108546,8 +108509,8 @@ cbF fGP dTz uKg -eYl -cwk +kXV +oxF aPk cBy aQo @@ -108803,8 +108766,8 @@ fja tVA uaG dBZ -ozT -eML +pnY +aAi kAq nrP aQo @@ -109060,8 +109023,8 @@ qmB qwW sBb qtf -cZd -rCs +pCk +qql aPk cBy aQo diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index f12520f3de46..051ce555e60c 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -20857,12 +20857,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"kjt" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "kju" = ( /turf/closed/wall/r_wall, /area/science/mixing) @@ -25905,15 +25899,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"mJX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "medpriv_shutters"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/medical/storage) "mKe" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 10 @@ -26643,6 +26628,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel, /area/engine/atmos/storage) +"ndD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "nel" = ( /obj/structure/cable{ icon_state = "1-8" @@ -26785,10 +26782,6 @@ }, /turf/open/floor/plating, /area/bridge) -"nhu" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "nhO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -28808,30 +28801,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"ohM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 10 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 9; - pixel_y = 11 - }, -/obj/item/wrench/medical{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "ohU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ @@ -29279,18 +29248,6 @@ }, /turf/open/floor/plasteel, /area/security/processing) -"oul" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/department/medical/central"; - dir = 4; - name = "Medbay Central Maintenance APC"; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "ovx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29397,6 +29354,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) +"ozh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = 24 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel, +/area/medical/storage) "ozp" = ( /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -31209,6 +31178,15 @@ }, /turf/open/space/basic, /area/solar/port/aft) +"ptJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 1 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "ptM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -32519,13 +32497,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/virology) -"pZb" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "pZd" = ( /turf/open/floor/plating/asteroid/airless, /area/science/test_area) @@ -33634,6 +33605,19 @@ "qBn" = ( /turf/closed/wall/r_wall, /area/security/brig) +"qBB" = ( +/obj/machinery/power/apc{ + areastring = "/area/maintenance/department/medical/central"; + dir = 4; + name = "Medbay Central Maintenance APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "qCJ" = ( /obj/machinery/light/floor, /turf/open/floor/engine/vacuum, @@ -36855,16 +36839,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"sfB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/turf/open/floor/plasteel, -/area/medical/storage) "sfE" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/plasteel/showroomfloor, @@ -38530,22 +38504,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/disposal) -"sUk" = ( -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "sUu" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "permabolt1"; @@ -41590,13 +41548,6 @@ "uBb" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/supply) -"uBc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "uBP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -43443,6 +43394,17 @@ }, /turf/open/space/basic, /area/solar/starboard/aft) +"vpH" = ( +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 1 + }, +/obj/structure/table, +/obj/item/wrench/medical{ + pixel_x = -5; + pixel_y = -2 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "vpP" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -76837,7 +76799,7 @@ jWt pWm mbY nzc -oul +qBB ewM nam lCr @@ -77862,10 +77824,10 @@ iww kIT rWu qGM -sfB -mJX -ohM -kjt +ozh +gnc +vpH +rjs szZ edn hvC @@ -78121,8 +78083,8 @@ apD apD apD nXR -sUk -nhu +ndD +rjs rjs edn xVn @@ -78378,8 +78340,8 @@ voD rEQ div nXR -pZb -nhu +ptJ +rjs mFg sbk rjs @@ -78635,8 +78597,8 @@ weE asv kqo bmm -pZb -uBc +ptJ +paE lxh lPG oXr diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 0f98560010a0..cbc18e2b4b47 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -719,24 +719,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/hallway/primary/fore) -"alp" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/machinery/camera{ - c_tag = "Medbay Cryogenics"; - dir = 8; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "alw" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -3737,23 +3719,6 @@ }, /turf/open/floor/plating/snowed/smoothed, /area/icemoon/top_layer/outdoors) -"beL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/item/tank/internals/air, -/obj/item/tank/internals/air, -/obj/item/clothing/mask/breath, -/obj/effect/landmark/xeno_spawn, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/medical/sleeper) "beQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -4902,13 +4867,6 @@ /obj/effect/landmark/stationroom/maint/threexthree, /turf/baseturf_bottom, /area/maintenance/port) -"bww" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "bwy" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -7645,16 +7603,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"cmo" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plating, -/area/medical/sleeper) "cms" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, @@ -9519,16 +9467,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"cRe" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "cRi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12516,19 +12454,6 @@ "dIY" = ( /turf/closed/wall, /area/science/research) -"dJh" = ( -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/item/trash/candy, -/obj/item/hand_labeler, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/medical/sleeper) "dJJ" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -15139,6 +15064,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) +"ezQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/medical/sleeper) "eAb" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -18975,6 +18907,20 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) +"fJC" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/item/tank/internals/air, +/obj/item/tank/internals/air, +/obj/item/clothing/mask/breath, +/obj/effect/landmark/xeno_spawn, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/medical/sleeper) "fJJ" = ( /obj/machinery/camera{ c_tag = "Holodeck"; @@ -20023,6 +19969,15 @@ "fXy" = ( /turf/baseturf_bottom, /area/science/test_area) +"fXz" = ( +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 5 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "fXF" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 @@ -22645,24 +22600,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/bridge) -"gJe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "gJj" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -23456,17 +23393,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"gTi" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "gTj" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -28439,6 +28365,18 @@ }, /turf/open/floor/plasteel/dark, /area/medical/storage) +"isx" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "isB" = ( /obj/structure/window/reinforced{ dir = 4 @@ -48038,16 +47976,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/mine/laborcamp) -"nSW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plating, -/area/medical/sleeper) "nSX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -48718,6 +48646,15 @@ "obU" = ( /turf/open/floor/plasteel, /area/construction/storage_wing) +"obX" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plating, +/area/medical/sleeper) "ock" = ( /obj/machinery/light{ dir = 4 @@ -49197,6 +49134,16 @@ "ohY" = ( /turf/open/floor/plasteel/white, /area/science/lab) +"oik" = ( +/obj/item/hand_labeler_refill, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/sleeper) "oiq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -50527,6 +50474,21 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"oCQ" = ( +/obj/machinery/door/airlock/medical{ + name = "Medbay Backroom"; + req_access_txt = "5" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/medical/sleeper) "oCS" = ( /obj/machinery/shower{ dir = 8 @@ -50830,6 +50792,16 @@ }, /turf/closed/wall, /area/maintenance/disposal) +"oJc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "oJC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52342,19 +52314,6 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"pja" = ( -/obj/item/hand_labeler_refill, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/medical/sleeper) "pjg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52705,6 +52664,18 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/plasteel, /area/security/main) +"pnz" = ( +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/clothing/neck/stethoscope, +/obj/item/trash/candy, +/obj/item/hand_labeler, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/medical/sleeper) "pnG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54066,6 +54037,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/quartermaster/storage) +"pIc" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/medical/sleeper) "pIe" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -55750,6 +55728,15 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) +"qkn" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "qkt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58910,6 +58897,21 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port) +"rdI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "rdS" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 5 @@ -60388,15 +60390,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/wood, /area/library) -"rCD" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/medical/sleeper) "rCX" = ( /obj/machinery/firealarm{ pixel_y = 26 @@ -60443,22 +60436,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"rDE" = ( -/obj/machinery/door/airlock/medical{ - name = "Medbay Backroom"; - req_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/medical/sleeper) "rER" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 @@ -61998,16 +61975,6 @@ dir = 5 }, /area/crew_quarters/kitchen) -"sag" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "sav" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -64732,39 +64699,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port) -"sOJ" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_y = 30 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 23 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "sON" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -65932,15 +65866,6 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) -"tew" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/medical/sleeper) "teD" = ( /turf/closed/wall, /area/medical/paramedic) @@ -73273,6 +73198,23 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) +"vjG" = ( +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_y = 30 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "vjK" = ( /obj/machinery/firealarm{ dir = 1; @@ -73624,6 +73566,21 @@ }, /turf/open/floor/plasteel/dark, /area/engine/foyer) +"vpr" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/camera{ + c_tag = "Medbay Cryogenics"; + dir = 8; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "vpE" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -76414,6 +76371,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"wcV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/medical/sleeper) "wda" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/spawner/structure/window/reinforced/shutter, @@ -82483,13 +82448,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/surgery) -"xId" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "xIf" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -105413,9 +105371,9 @@ sOG bso lYb dzt -nSW -pja -rCD +pIc +oik +obX dzt eql sRs @@ -105670,8 +105628,8 @@ mOp jbo rwz dzt -cmo -dJh +ezQ +pnz uVh dzt jFB @@ -105928,11 +105886,11 @@ jbo axs dzt dVf -beL -tew -rDE -gTi -gJe +fJC +wcV +oCQ +oJc +rdI mYw scR ear @@ -106188,8 +106146,8 @@ trU oiq yee dzt -sag -cRe +isx +qkn qGE kQb npj @@ -106445,8 +106403,8 @@ teD teD teD dzt -sOJ -xId +vjG +spq uOh dlg ndl @@ -106702,8 +106660,8 @@ ukM hGF vuZ dzt -bww -alp +fXz +vpr keA iKm bbe diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 176958d37e77..48c507e213a0 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -6049,24 +6049,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aQI" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, -/obj/machinery/camera{ - c_tag = "Medbay Cryogenics"; - dir = 1; - network = list("ss13","medbay") - }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "aQL" = ( /obj/structure/closet/wardrobe/white, /turf/open/floor/plasteel, @@ -11259,6 +11241,14 @@ }, /turf/open/floor/plating, /area/bridge) +"bIr" = ( +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "bIv" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -21140,21 +21130,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"eLr" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC"; - pixel_y = -32 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "eLF" = ( /obj/effect/landmark/start/security_officer, /obj/effect/turf_decal/trimline/darkblue/filled/line/lower{ @@ -22000,16 +21975,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel/white, /area/security/brig) -"fbd" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "fbF" = ( /obj/structure/table, /obj/item/radio/off, @@ -23246,6 +23211,16 @@ /obj/item/stack/rods/twentyfive, /turf/open/floor/plasteel, /area/escapepodbay) +"fxT" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "fxX" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/pump, @@ -35913,12 +35888,6 @@ }, /turf/open/space/basic, /area/ai_monitored/turret_protected/ai) -"kpp" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/medical/storage) "kpQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -37611,16 +37580,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"laU" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "laX" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -39972,12 +39931,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"lXo" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "lXt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43084,6 +43037,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/prison) +"nba" = ( +/obj/item/wrench/medical{ + pixel_x = -4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/blue/filled/line/lower, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "nbf" = ( /obj/machinery/airalarm{ dir = 4; @@ -44370,30 +44331,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"nAj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/item/wrench/medical{ - pixel_x = -4 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_y = 10 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = -2 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "nAp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -46159,12 +46096,6 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower, /turf/open/floor/plasteel/white, /area/science/research) -"onn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "onr" = ( /obj/effect/turf_decal/arrows/white{ color = "#99ccff" @@ -53236,11 +53167,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"qRq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/sleeper) "qRK" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -56798,12 +56724,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/showroomfloor, /area/security/main) -"shN" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "shT" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -58862,6 +58782,19 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"sYU" = ( +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC"; + pixel_y = -32 + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "sZn" = ( /obj/structure/table/wood, /obj/item/stamp/captain{ @@ -67751,6 +67684,16 @@ }, /turf/open/floor/plasteel, /area/clerk) +"woH" = ( +/obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/frame/machine{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "woN" = ( /obj/structure/chair{ dir = 8 @@ -109167,8 +109110,8 @@ dDw sIY sha bDR -onn -fbd +bDR +woH bvj xqN rqB @@ -109424,8 +109367,8 @@ bvj nQi sha bDR -lXo -laU +bDR +fxT bvj gzm fnY @@ -109681,8 +109624,8 @@ bvj tLC sha jJP -lXo -aQI +bDR +bIr bvj qdS rCs @@ -109938,8 +109881,8 @@ bvj udl sha bDR -lXo -eLr +bDR +sYU bvj jdO jdO @@ -110195,10 +110138,10 @@ dDw gYW hRR bDR -shN -nAj -qRq -kpp +bDR +nba +dDw +mFt mFt iTq eVb