From 8af10e8c6d70364b688dd2b2ad4195bff749b41c Mon Sep 17 00:00:00 2001 From: "Mr. Gazer 'Toxic Player' Gazer" Date: Tue, 8 Dec 2020 01:41:41 -0500 Subject: [PATCH] Surfmed Mapfixes - Fixed an issue with disposals in Triage - Added NIFsoft uploaders in storage - Added the chemistry wardrobe closet - Added a hallway where the second floor maintenence exit was, moving the security substation wire drop to surface three in the process. - Fixed a double layered windoor in triage - Fixed a mismatched vent and scrubber in recovery ward bathroom - Added an extra column of tiles to triage - Added carpet to the CMO office. --- maps/tether/tether-02-surface2.dmm | 622 +++++---- maps/tether/tether-03-surface3.dmm | 1890 +++++++++++++++------------- 2 files changed, 1362 insertions(+), 1150 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 7477eebaed4..8217e20e90a 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -544,6 +544,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aaN" = ( @@ -907,7 +909,9 @@ /area/tether/surfacebase/medical/bathroom) "abj" = ( /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "abk" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -1623,13 +1627,13 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "ach" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "aci" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acj" = ( /obj/structure/bed/chair/office/light, @@ -1664,7 +1668,7 @@ /obj/effect/landmark/start{ name = "Chief Medical Officer" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "ack" = ( /obj/structure/filingcabinet, @@ -1819,13 +1823,13 @@ /obj/item/weapon/stamp/cmo, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acB" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acC" = ( /turf/simulated/wall, @@ -2175,7 +2179,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "add" = ( /obj/structure/bed/chair{ @@ -2186,7 +2190,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "ade" = ( /obj/machinery/power/apc{ @@ -2562,12 +2566,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "adJ" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/medbay{ + dir = 9; + icon_state = "camera" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "adK" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/green{ @@ -2581,13 +2587,13 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "adL" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "adM" = ( /obj/machinery/disposal, @@ -2968,7 +2974,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "aeq" = ( /obj/structure/filingcabinet/chestdrawer, @@ -3645,16 +3651,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "afr" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 1; - name = "Maintenance Access" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0 }, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "afs" = ( @@ -3664,6 +3667,8 @@ icon_state = "4-8"; pixel_x = 0 }, +/obj/structure/catwalk, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "aft" = ( @@ -4109,10 +4114,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "aga" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 1; + name = "Maintenance Access" }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/firedoor/glass, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, /area/maintenance/lower/north) "agb" = ( /obj/machinery/door/airlock/command{ @@ -4503,9 +4511,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) "agM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4519,18 +4524,15 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "agN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -4539,6 +4541,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "agO" = ( @@ -5513,6 +5521,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "aiq" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) "air" = ( @@ -5843,26 +5857,26 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aiR" = ( -/obj/structure/morgue, +/obj/structure/morgue{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "aiT" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ id_tag = "SurfMedicalResleevingMaintExit"; - name = "Maintenance Access"; + name = "Medbay Exit"; req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aiV" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aiW" = ( -/obj/structure/morgue{ - dir = 8 - }, +/obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "aiX" = ( @@ -6233,7 +6247,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -6720,7 +6734,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -8067,12 +8081,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) "anB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "anC" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -8683,23 +8695,21 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aoI" = ( -/obj/structure/ladder/up, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/substation/medsec) -"aoJ" = ( -/obj/structure/catwalk, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) +"aoJ" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "aoK" = ( /obj/structure/mirror{ dir = 4; @@ -8727,14 +8737,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) "aoN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "aoO" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/newscaster{ @@ -10239,12 +10249,14 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "arQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "arR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/mining) "arS" = ( @@ -10748,10 +10760,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/medsec) -"asO" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/substation/medsec) "asP" = ( /obj/machinery/alarm{ dir = 1; @@ -10772,24 +10780,23 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "asT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "asU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, /obj/structure/cable{ icon_state = "4-8" }, @@ -10799,10 +10806,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 1; - name = "Maintenance Access" - }, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/mining) "asV" = ( @@ -11271,10 +11275,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "atX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11282,12 +11282,11 @@ dir = 4 }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/firedoor/glass, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, /area/maintenance/lower/north) "atY" = ( /turf/simulated/wall, @@ -13082,42 +13081,22 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "axu" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 }, -/obj/machinery/newscaster{ - pixel_x = 0; - pixel_y = 30 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "axv" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "axw" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13165,6 +13144,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/newscaster{ + pixel_y = 30 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "axz" = ( @@ -35220,22 +35202,10 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "boC" = ( -/obj/structure/cable/green{ - icon_state = "16-0" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) "boD" = ( /turf/simulated/wall/r_wall, @@ -35274,8 +35244,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "boI" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -35374,25 +35344,35 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-4" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "boR" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + icon_state = "railing0" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor, /area/maintenance/lower/north) "boS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -35416,6 +35396,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "bpi" = ( @@ -35502,33 +35483,32 @@ /turf/simulated/open, /area/maintenance/lower/north) "bpG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "bpH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "bpI" = ( @@ -35578,22 +35558,34 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/medical/bathroom) "bpK" = ( -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "bpL" = ( -/obj/random/junk, -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "bpO" = ( -/obj/random/medical/lite, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/structure/closet/crate, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "bpS" = ( @@ -35666,6 +35658,148 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"foy" = ( +/obj/structure/railing{ + dir = 1; + icon_state = "railing0" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) +"fxr" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"irb" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Infirmary Lobby" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"kPb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"kRb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"laD" = ( +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/outside/outside2) +"mnt" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"nFT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"nWg" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"oXI" = ( +/obj/structure/railing{ + dir = 1; + icon_state = "railing0" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"sZp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"tpu" = ( +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"tHa" = ( +/obj/structure/railing{ + dir = 4; + icon_state = "railing0" + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) +"vlQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, +/area/maintenance/lower/north) +"xSO" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"ylZ" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) (1,1,1) = {" aaa @@ -46635,7 +46769,7 @@ aeX aoG apT apT -apT +bpO asM atU auI @@ -46908,9 +47042,9 @@ afg adX apW aiJ -aiJ aaK aiJ +aiJ ajI alI apW @@ -47202,12 +47336,12 @@ amF apV asd alD -anC -anC +boR +tpu bpG afs -adt -adt +laD +aac adt avD axp @@ -47347,9 +47481,9 @@ auN boQ bpe bpH -afs -adt -adt +afr +laD +aac adt avD axq @@ -47486,11 +47620,11 @@ amH alD asN alD -boR +anC anC boS -afs -adt +nFT +aac avD avD avD @@ -47626,13 +47760,13 @@ aku akM aoI aiq -asO +boC boC boI +boI +kRb +ylZ anC -boS -afs -bpK avD awd awO @@ -47766,15 +47900,15 @@ aiw akM akM akM -aoJ -anB -aoN -anB -anB -anB +alD +alD +alD +alD +ajE +ajE atX aga -bpL +ajE avD avD avD @@ -47906,21 +48040,21 @@ aaE aaU abt aiT -anC -anC -anC -anC -anC -anC -anC -arQ -asT -anC -bpO -adt -adt -avD +aet +aoJ +aet +aet axu +aet +bpK +aet +asT +aet +aet +fxr +aet +irb +axp ayd ayI azc @@ -48045,24 +48179,24 @@ agS aes aes agM -aet +anB aaM abj -anC -anC -anC -anC -anC -adJ -anC -arQ -asT -anC -anC -adt -adt -avD +anB +aoN +anB +anB axv +adJ +bpL +arQ +sZp +aet +aet +xSO +aet +nWg +axp ayd ayI azc @@ -48197,14 +48331,14 @@ ajG ajG ajG ajG -arQ -asT -anC -anC -adt -adt +ajE +vlQ +aga +ajE +aac +aac avD -axq +mnt aye ayJ azd @@ -48339,11 +48473,11 @@ anD aoO apX ajG -arQ -asT -anC -anC -adt +tpu +kPb +tpu +oXI +aac adt avD axw @@ -48483,8 +48617,8 @@ apY ajG arR asU -atY -atY +tHa +foy atY atY avD diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 32bcc716e28..b1275b504bf 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -41,6 +41,7 @@ opacity = 0; open_layer = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/upperhall) "aah" = ( @@ -156,16 +157,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/upperhall) "aat" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/upperhall) "aau" = ( @@ -233,55 +225,59 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "aaz" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + closed_layer = 10; + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + layer = 1; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0; + open_layer = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/medical/storage) +"aaA" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "MedbayTriage"; + name = "Medbay Airlock"; + req_one_access = list(5) + }, +/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay foyer."; - dir = 1; - id = "MedbayTriage"; - name = "Medbay Doors Control"; - pixel_x = -25; - pixel_y = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/upperhall) -"aaA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aaB" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, /obj/effect/floor_decal/borderfloorwhite{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 + dir = 9 + }, +/obj/structure/table/standard, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/firealarm{ + pixel_y = 25 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaC" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/random/medical, -/obj/item/weapon/cane, -/obj/structure/table/standard, -/obj/item/weapon/cane, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -364,19 +360,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5,24) - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aaJ" = ( /obj/structure/table/standard, -/obj/item/device/sleevemate, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -384,6 +371,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/item/clothing/accessory/stethoscope, +/obj/item/clothing/accessory/stethoscope, +/obj/item/clothing/accessory/stethoscope, +/obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaK" = ( @@ -407,25 +398,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaL" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/machinery/camera/network/medbay{ +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "aaM" = ( /obj/structure/railing{ @@ -492,16 +474,35 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aaQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay foyer."; + dir = 1; + id = "MedbayTriage"; + name = "Medbay Doors Control"; + pixel_x = -25; + pixel_y = -30 }, -/obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/upperhall) "aaR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/medical/storage) +"aaS" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/syringegun, /obj/item/weapon/gun/launcher/syringe, @@ -516,15 +517,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"aaS" = ( -/obj/effect/landmark/start{ - name = "Paramedic" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "aaT" = ( /obj/structure/sign/nosmoking_1{ pixel_x = 32 @@ -542,30 +534,6 @@ /obj/item/weapon/soap/nanotrasen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"aaU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -30; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aaV" = ( /obj/structure/cable/green{ d1 = 4; @@ -641,21 +609,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aaZ" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, /obj/structure/table/standard, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/firealarm{ - pixel_y = 25 +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 }, +/obj/item/device/radio/intercom/department/medbay{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) +/area/tether/surfacebase/medical/surgery2) "aba" = ( /obj/machinery/camera/network/medbay{ dir = 10 @@ -664,17 +632,27 @@ /turf/simulated/open, /area/tether/surfacebase/medical/upperhall) "abb" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) +"abc" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"abc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 +/obj/structure/bed/chair/wheelchair{ + dir = 4 + }, +/obj/structure/bed/chair/wheelchair{ + dir = 4 + }, +/obj/structure/bed/chair/wheelchair{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) @@ -683,41 +661,48 @@ dir = 8; health = 1e+006 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "abe" = ( -/obj/machinery/vitals_monitor, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) +/area/tether/surfacebase/medical/upperhall) "abf" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/medical_stand, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "abg" = ( @@ -729,30 +714,15 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "abh" = ( -/obj/structure/closet/crate{ - icon_state = "crate"; - name = "Grenade Crate"; - opened = 0 - }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/weapon/tool/screwdriver, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(67) - }, -/obj/structure/cable/green, -/obj/structure/medical_stand, +/obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/medical_stand, +/obj/effect/floor_decal/borderfloorwhite/corner2, +/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/structure/medical_stand, +/obj/structure/medical_stand, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "abi" = ( @@ -845,18 +815,41 @@ /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) "abn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) +"abo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) +"abp" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery2) +"abq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -864,62 +857,15 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"abo" = ( -/obj/machinery/vending/blood, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"abp" = ( -/obj/machinery/computer/guestpass{ - pixel_y = 28 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) -"abq" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "abr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 8 }, /obj/structure/cable/green{ @@ -927,15 +873,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "abs" = ( @@ -1345,20 +1282,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "abU" = ( @@ -1482,12 +1419,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acd" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/camera/network/medbay{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -1522,11 +1472,6 @@ "acg" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/box/beakers, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -1539,36 +1484,34 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "ach" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/vending/wallmed1{ + dir = 1; + pixel_y = -30 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aci" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre 2"; + req_access = list(45) }, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) @@ -1898,38 +1841,6 @@ }, /turf/simulated/open, /area/tether/surfacebase/medical/upperhall) -"acN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "acO" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1988,26 +1899,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "acR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acS" = ( @@ -2032,25 +1923,20 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acT" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acU" = ( @@ -2110,44 +1996,32 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "ada" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/vitals_monitor, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 9 + }, +/obj/machinery/vitals_monitor, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) +"adb" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"adb" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "light switch "; - pixel_x = 24; - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "adc" = ( -/obj/machinery/vending/medical, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "add" = ( @@ -2425,25 +2299,30 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "adu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals6{ +/obj/machinery/computer/guestpass{ + pixel_y = 28 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "adv" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "adw" = ( -/obj/structure/closet/secure_closet/medical1, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -2459,6 +2338,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, +/obj/machinery/vending/medical{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "adx" = ( @@ -2606,19 +2488,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/structure/closet/crate/freezer, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "adG" = ( @@ -2671,8 +2546,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30; + pixel_y = -24 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) @@ -2771,10 +2661,38 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "adV" = ( -/obj/structure/ladder, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/structure/table/rack, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/bodybag/cryobag{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/weapon/storage/toolbox/emergency{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) "adW" = ( /turf/simulated/wall, /area/tether/surfacebase/security/processing) @@ -2809,10 +2727,12 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "aea" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "aeb" = ( @@ -2821,41 +2741,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "aec" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/vending/wallmed1{ - pixel_x = 30 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery1) -"aed" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "aee" = ( @@ -2887,33 +2776,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable/green{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Medical Storage"; - sortType = "Medical Storage" + icon_state = "4-8" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aeh" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - id_tag = "MedbayTriage"; - name = "Medbay Airlock"; - req_one_access = list(5) - }, -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/area/tether/surfacebase/medical/storage) "aei" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3192,11 +3071,8 @@ /area/tether/surfacebase/security/briefingroom) "aeD" = ( /obj/effect/floor_decal/techfloor{ - dir = 8 + dir = 9 }, -/obj/item/weapon/storage/box/lights/mixed, -/obj/structure/table/steel, -/obj/random/tech_supply, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aeE" = ( @@ -3373,19 +3249,16 @@ /area/tether/surfacebase/medical/triage) "aeS" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 24 +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ - dir = 1; - pixel_x = 0; - pixel_y = 24 +/obj/item/device/healthanalyzer, +/obj/machinery/alarm{ + pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/medbay, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "aeT" = ( @@ -3501,13 +3374,23 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "afb" = ( -/obj/structure/sink{ - pixel_y = 32 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -26 }, -/obj/structure/closet/secure_closet/medical2, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/closet/crate/freezer, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "afc" = ( @@ -3773,38 +3656,32 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "afx" = ( +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre 2"; + req_access = list(45) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -30; - pixel_y = -24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "afy" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "surfsurgery2" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery1) "afz" = ( /obj/structure/bed/chair/office/light, @@ -3815,11 +3692,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "afA" = ( -/obj/machinery/light{ - dir = 2 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) @@ -4015,10 +3890,17 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/cup{ - desc = "Taste liberty"; - name = "Cup of Liber-tea" +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/tech_supply, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) @@ -4168,6 +4050,12 @@ pixel_x = -12 }, /obj/structure/table/reinforced, +/obj/item/weapon/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/weapon/folder/white, +/obj/item/weapon/pen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "agm" = ( @@ -4432,33 +4320,27 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/security/briefingroom) "agJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/door/firedoor/glass, +/obj/structure/lattice, +/obj/structure/cable/green{ + d1 = 32; + d2 = 4; + icon_state = "32-4" }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/tech_supply, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/open, /area/maintenance/lower/medsec_maintenance) "agK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "agL" = ( @@ -4475,6 +4357,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/medical, /obj/structure/closet, +/obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "agM" = ( @@ -4632,14 +4515,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ahb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Medical Storage"; + sortType = "Medical Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 2 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -4990,16 +4876,15 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "ahF" = ( @@ -25458,6 +25343,12 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aSV" = ( @@ -25560,13 +25451,19 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aTj" = ( -/obj/machinery/vitals_monitor, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, +/obj/structure/table/glass, +/obj/item/weapon/folder/white, +/obj/item/weapon/pen, +/obj/item/weapon/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aTk" = ( @@ -25595,17 +25492,11 @@ /area/tether/surfacebase/medical/storage) "aTq" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner"; - pixel_x = 2; - pixel_y = 2 +/obj/item/device/healthanalyzer, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aTr" = ( @@ -25631,16 +25522,17 @@ /area/maintenance/lower/medsec_maintenance) "aTs" = ( /obj/structure/table/standard, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/item/device/radio/intercom/department/medbay{ + dir = 8; + pixel_x = -24 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aTt" = ( @@ -25847,28 +25739,26 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "aTL" = ( +/obj/structure/table/standard, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery2) +"aTM" = ( /obj/machinery/oxygen_pump/anesthetic, /turf/simulated/wall, /area/tether/surfacebase/medical/surgery2) -"aTM" = ( -/obj/structure/table/standard, -/obj/item/stack/nanopaste, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aTN" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner"; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/radio/intercom/department/medbay{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/stack/nanopaste, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aTO" = ( @@ -25949,21 +25839,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "aTV" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/item/device/radio/intercom/department/medbay{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aTX" = ( @@ -26076,9 +25958,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aUj" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/item/device/radio/intercom/department/medbay{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/disposal, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aUk" = ( @@ -26170,8 +26064,7 @@ /area/tether/surfacebase/medical/lobby) "aUt" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) @@ -26274,9 +26167,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUD" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/upperhall) +/area/tether/surfacebase/medical/triage) "aUF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -26287,6 +26185,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/structure/closet/crate/freezer, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/weapon/reagent_containers/blood/OMinus, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery2) +"aUH" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, /obj/item/device/radio/intercom{ @@ -26296,7 +26213,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aUH" = ( +"aUI" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 }, @@ -26307,27 +26224,16 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aUI" = ( +"aUJ" = ( /obj/machinery/optable, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aUJ" = ( +"aUK" = ( /obj/effect/floor_decal/industrial/loading{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aUK" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aUL" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) @@ -26507,36 +26413,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aVc" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/item/bodybag/cryobag{ - pixel_x = -2; - pixel_y = -2 +/obj/effect/landmark/start{ + name = "Paramedic" }, -/obj/item/bodybag/cryobag{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/weapon/storage/toolbox/emergency{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aVd" = ( @@ -26622,6 +26501,9 @@ /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, +/obj/item/device/radio/intercom{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aVj" = ( @@ -26782,9 +26664,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVv" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/closet/secure_closet/medical2, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) +/area/tether/surfacebase/medical/surgery2) "aVw" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -26916,6 +26801,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aVM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/upperhall) +"aVN" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -26923,16 +26818,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery2) -"aVN" = ( -/obj/structure/table/standard, -/obj/item/device/healthanalyzer, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aVO" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -26987,6 +26872,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "aVT" = ( +/obj/structure/table/standard, +/obj/item/device/healthanalyzer, +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery2) +"aVU" = ( /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 @@ -26998,10 +26893,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aVU" = ( -/obj/machinery/computer/operating, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aVV" = ( /obj/machinery/account_database{ dir = 8 @@ -27022,6 +26913,10 @@ }, /area/tether/surfacebase/surface_three_hall) "aVY" = ( +/obj/machinery/computer/operating, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery2) +"aVZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, @@ -27030,15 +26925,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"aVZ" = ( -/obj/structure/table/standard, -/obj/item/device/healthanalyzer, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "aWa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -27052,6 +26938,12 @@ /turf/simulated/wall, /area/tether/surfacebase/security/upperhall) "aWd" = ( +/obj/effect/landmark/start{ + name = "Medical Doctor" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) +"aWe" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/lights/mixed, /obj/item/device/flashlight, @@ -27072,15 +26964,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"aWe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "aWf" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -27328,13 +27211,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aWA" = ( -/obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) @@ -27612,17 +27493,24 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30; + pixel_y = 0 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aXd" = ( @@ -33495,7 +33383,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "bho" = ( @@ -34641,12 +34533,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "bjy" = ( /obj/item/device/healthanalyzer, /obj/item/bodybag/cryobag, -/obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -34656,16 +34548,33 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bjB" = ( -/obj/effect/landmark/start{ - name = "Medical Doctor" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/item/device/sleevemate, +/obj/item/weapon/storage/box/nifsofts_medical, +/obj/item/weapon/storage/box/nifsofts_medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bjC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start{ + name = "Medical Doctor" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"bjE" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/o2{ pixel_x = 5; @@ -34679,10 +34588,11 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"bjE" = ( +/area/tether/surfacebase/medical/lowerhall) +"bjF" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/adv{ pixel_x = 5; @@ -34693,13 +34603,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"bjF" = ( -/obj/effect/landmark/start{ - name = "Paramedic" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) +/area/tether/surfacebase/medical/lowerhall) "bjH" = ( /obj/machinery/light{ dir = 1 @@ -34872,26 +34776,38 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bjV" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre 2"; - req_access = list(45) - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) +"bjY" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -24 + }, +/obj/machinery/camera/network/medbay{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"bjY" = ( +"bjZ" = ( /obj/machinery/alarm{ dir = 1; pixel_y = -24 @@ -34899,13 +34815,6 @@ /obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) -"bjZ" = ( -/obj/machinery/vending/wallmed1{ - dir = 1; - pixel_y = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery2) "bka" = ( /obj/structure/railing{ dir = 1 @@ -35430,6 +35339,16 @@ /turf/simulated/floor/plating, /area/rnd/robotics/resleeving) "blh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/effect/landmark/start{ + name = "Medical Doctor" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) +"bli" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/toxin{ pixel_x = 5; @@ -35441,10 +35360,11 @@ }, /obj/effect/floor_decal/corner/green/full, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"bli" = ( +/area/tether/surfacebase/medical/lowerhall) +"blj" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/fire{ pixel_x = 5; @@ -35458,13 +35378,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"blj" = ( -/obj/effect/landmark/start{ - name = "Medical Doctor" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) +/area/tether/surfacebase/medical/lowerhall) "blm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5; @@ -35524,16 +35438,43 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/surgery1) "blr" = ( -/obj/structure/bed/chair/wheelchair{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"blt" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +"blt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "blu" = ( /obj/structure/table/rack, /obj/item/roller, @@ -35629,14 +35570,39 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "blD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/surgery1) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "blG" = ( +/obj/structure/sink{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/closet/secure_closet/medical2, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery1) +"blH" = ( /obj/structure/table/standard, /obj/machinery/firealarm{ dir = 2; @@ -35649,26 +35615,30 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) -"blH" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner"; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/healthanalyzer, -/obj/machinery/alarm{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery1) "blK" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "blM" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/obj/item/device/radio/intercom/department/medbay{ + dir = 1; + pixel_x = 0; + pixel_y = 24 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/camera/network/medbay, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery1) +"blN" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; @@ -35677,20 +35647,12 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"blN" = ( +"blO" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/medical_stand, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) -"blO" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "blP" = ( @@ -35708,6 +35670,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "blR" = ( @@ -35739,11 +35706,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "blV" = ( @@ -35756,32 +35718,37 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "blW" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre 2"; - req_access = list(45) - }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/surgery1) +/area/tether/surfacebase/medical/triage) "blZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "bmc" = ( @@ -35820,30 +35787,48 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bme" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - id_tag = null; - name = "Medbay Storage"; - req_access = list(5); - req_one_access = list(5) +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmk" = ( -/obj/structure/table/standard, +/obj/structure/closet/crate{ + icon_state = "crate"; + name = "Grenade Crate"; + opened = 0 + }, +/obj/item/weapon/grenade/chem_grenade, +/obj/item/weapon/grenade/chem_grenade, +/obj/item/weapon/grenade/chem_grenade, +/obj/item/device/assembly/timer, +/obj/item/device/assembly/timer, +/obj/item/device/assembly/timer, +/obj/item/device/assembly/igniter, +/obj/item/device/assembly/igniter, +/obj/item/device/assembly/igniter, +/obj/item/weapon/tool/screwdriver, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(67) + }, +/obj/structure/cable/green, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bml" = ( /obj/structure/table/standard, -/obj/structure/bedsheetbin, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -35853,6 +35838,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmm" = ( @@ -35891,15 +35877,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/techfloor{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "bmp" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -35912,11 +35895,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "bmq" = ( @@ -35962,15 +35940,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmx" = ( -/obj/structure/medical_stand, +/obj/machinery/light{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "bmy" = ( -/obj/machinery/optable, -/obj/machinery/oxygen_pump/anesthetic{ - dir = 1; - pixel_y = -32 - }, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "bmz" = ( @@ -35996,15 +35975,21 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmC" = ( -/obj/machinery/computer/operating, +/obj/machinery/optable, +/obj/machinery/oxygen_pump/anesthetic{ + dir = 1; + pixel_y = -32 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "bmE" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = null; + name = "Medbay Storage"; + req_access = list(5); + req_one_access = list(5) }, +/obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmF" = ( @@ -36193,7 +36178,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - dir = 1 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -36220,14 +36206,20 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -36356,9 +36348,27 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "bnq" = ( -/obj/machinery/light, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/vending/wallmed1{ + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery1) +"bnr" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; id_tag = null; @@ -36366,17 +36376,8 @@ req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) -"bnr" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) +/area/tether/surfacebase/medical/lowerhall) "bnt" = ( /obj/machinery/door/airlock/medical{ name = "Medical Admin Access" @@ -36422,10 +36423,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bnz" = ( -/obj/machinery/smartfridge/chemistry/chemvator, /obj/machinery/door/firedoor/glass, -/turf/simulated/wall, -/area/tether/surfacebase/medical/triage) +/obj/machinery/smartfridge/chemistry, +/turf/simulated/floor/plating, +/area/tether/surfacebase/medical/chemistry) "bnA" = ( /obj/structure/medical_stand, /obj/effect/floor_decal/borderfloorwhite{ @@ -36529,7 +36530,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/area/tether/surfacebase/medical/chemistry) "bnJ" = ( /obj/structure/cable/green{ d1 = 4; @@ -36551,9 +36552,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bnK" = ( -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -36597,13 +36595,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/closet/secure_closet/medical1, +/obj/item/device/radio/headset/headset_med, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/fancy/vials, +/obj/item/weapon/storage/fancy/vials, +/obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, +/obj/structure/closet/wardrobe/chemistry_white, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bnM" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -36621,6 +36622,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/closet/secure_closet/medical1, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bnN" = ( @@ -36628,11 +36630,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -36644,6 +36641,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bnP" = ( @@ -36671,6 +36671,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, +/obj/item/stack/material/phoron, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bnT" = ( @@ -36734,7 +36739,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) +/area/tether/surfacebase/medical/lowerhall) "bob" = ( /obj/machinery/firealarm{ dir = 1; @@ -36747,7 +36752,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) +/area/tether/surfacebase/medical/lowerhall) "boc" = ( /obj/machinery/status_display{ layer = 4; @@ -36756,16 +36761,15 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) +/area/tether/surfacebase/medical/lowerhall) "bod" = ( -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 32; - d2 = 1; - icon_state = "32-1" +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/open, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "boe" = ( /obj/effect/floor_decal/borderfloor{ @@ -38438,6 +38442,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"heL" = ( +/obj/machinery/computer/operating, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/surgery1) "hgf" = ( /obj/machinery/door/firedoor/glass/hidden{ dir = 2 @@ -38594,11 +38602,6 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "hLd" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, @@ -39062,6 +39065,29 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"jSV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jYd" = ( /obj/structure/cable/green{ d1 = 4; @@ -39372,6 +39398,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) +"kUs" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "kXo" = ( /obj/structure/noticeboard{ pixel_y = -26 @@ -40111,6 +40153,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"obw" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) "olG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41243,6 +41294,24 @@ }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) +"sJv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "sLa" = ( /obj/machinery/firealarm{ layer = 3.3; @@ -42057,6 +42126,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"vSu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + desc = "Taste liberty"; + name = "Cup of Liber-tea" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "vTf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -54557,7 +54635,7 @@ abm abR abR abR -abS +vSu aaE bmo orc @@ -54699,7 +54777,7 @@ aky mAl abR adZ -adV +abR aaE bmp bod @@ -55969,9 +56047,9 @@ aac aac aac aag -aUD -aaz -aeh +aUQ +aUQ +aah abd blz aWa @@ -55980,7 +56058,7 @@ bmA bmQ bmY bnk -aah +aTd bnI aTd aTd @@ -56115,7 +56193,7 @@ aat aaQ aaA abn -acN +acR acR acT adc @@ -56251,20 +56329,20 @@ aaq aac aac aac -acy -acy -acy -aVM +aac +aag +abe aVM +aUD bjV -blq +blt blD blW -blD -blq -abs -bnq -aah +sJv +kUs +jSV +bnk +aTd bnK bnP bnS @@ -56394,13 +56472,13 @@ aac aac aac acy -aTq -aUG +acy +acy +aVN aVN -aaU aci blq -aed +afy afx afy blq @@ -57102,17 +57180,17 @@ aac aac aac aac -aao -aao -acy -acy -acy -acy +aac acy +aaZ +abp +aTq +aUG +aVv blq -blq -blq -blq +blM +bnq +heL blq abx aca @@ -57245,17 +57323,17 @@ aac aac aac aao -aaZ -aTV -aVc -aWd -aaL -aaR -abb -abb -abe -aao -abp +acy +acy +acy +acy +acy +acy +blq +blq +blq +blq +blq abT aWi aWi @@ -57389,14 +57467,14 @@ aac aao aaB aUj -aUv +adV aWe bjB aaS abc bmg ada -bme +aao adu bnc aej @@ -57531,12 +57609,12 @@ aac aao aaC aUt -aVv +aUv aWA bjC blh -blt -blM +aUv +aUv adb bmE adv @@ -57670,17 +57748,17 @@ aab aab aac aac -aao +aaz aaD -aUv -aUv -aWJ +abb +aeh +aTV bjE bli blr blN abf -aao +obw abq ahb bnu @@ -57812,7 +57890,7 @@ aab aab aab aaq -aao +aaz acU aUv aUv @@ -57954,15 +58032,15 @@ aab aab aab aaq -aao +aaz aaH aUv aUv aWJ +aVc +aWd aUv -aUv -aUv -aUv +bme bmk aao aSV @@ -58096,7 +58174,7 @@ aab aab aab aaq -aao +aaz aTp aUA aaJ @@ -58238,12 +58316,12 @@ aab aab aab aaq -aao -aao -aao -aao -aao -aao +aaL +aaR +aaR +aaR +aaR +aaR aao aao aao