From f94bfe1603d572d797588b1b7c9faebba6149f0a Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Sun, 17 Aug 2025 14:32:51 +0100 Subject: [PATCH] The Great Medical Shuffle (#21135) Prodding at swapping the placements of the paramedics' quarters, recovery room, and psychiatrist's office, hopefully maintaining or improving the functionality of each with a particular focus on getting the recovery room into a better spot. image --- image --- image --- .../crates_lockers/closets/secure/medical.dm | 1 + html/changelogs/hazelmouse-medicalshuffle.yml | 58 + .../areas/horizon_areas_medical.dm | 6 +- maps/sccv_horizon/sccv_horizon.dmm | 2009 +++++++++-------- 4 files changed, 1123 insertions(+), 951 deletions(-) create mode 100644 html/changelogs/hazelmouse-medicalshuffle.yml diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a6b244cd5f0..8132f1d070d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -126,6 +126,7 @@ new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/auto_cpr(src) + new /obj/item/defibrillator/compact/loaded(src) new /obj/item/clothing/suit/storage/toggle/para_jacket(src) new /obj/item/clothing/suit/storage/toggle/para_jacket/zeng(src) new /obj/item/clothing/suit/storage/toggle/para_jacket/pmc(src) diff --git a/html/changelogs/hazelmouse-medicalshuffle.yml b/html/changelogs/hazelmouse-medicalshuffle.yml new file mode 100644 index 00000000000..9f463779869 --- /dev/null +++ b/html/changelogs/hazelmouse-medicalshuffle.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Remapped medical by shuffling the positions of the psychiatric office, paramedics' quarters, and recovery room. This is primarily intended to make recovery a more appealing and visible spot." diff --git a/maps/sccv_horizon/areas/horizon_areas_medical.dm b/maps/sccv_horizon/areas/horizon_areas_medical.dm index a19ab043ae2..b1134315298 100644 --- a/maps/sccv_horizon/areas/horizon_areas_medical.dm +++ b/maps/sccv_horizon/areas/horizon_areas_medical.dm @@ -11,7 +11,7 @@ /area/horizon/medical/paramedic name = "Paramedic Equipment Storage" icon_state = "medbay" - horizon_deck = 2 + horizon_deck = 3 /area/horizon/medical/reception name = "Reception" @@ -72,13 +72,13 @@ /area/horizon/medical/ward name = "Recovery Ward" icon_state = "patients" - horizon_deck = 3 + horizon_deck = 2 /area/horizon/medical/ward/isolation name = "Isolation Ward" area_blurb = "This seldom-used ward somehow smells sterile and musty at the same time." area_blurb_category = "medical_isolation" - horizon_deck = 2 + horizon_deck = 3 /area/horizon/medical/emergency_storage name = "Emergency Storage" diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 29d9ed56833..00dd8d4e0bc 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -366,10 +366,14 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/lattice, +/obj/structure/platform/ledge, /obj/structure/platform/ledge{ dir = 8 }, +/obj/structure/platform_deco/ledge{ + dir = 9 + }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "acx" = ( @@ -601,7 +605,9 @@ dir = 4 }, /obj/structure/cable/green{ - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/horizon/medical/gen_treatment) @@ -2615,13 +2621,13 @@ }, /area/centcom/specops) "aqe" = ( -/obj/machinery/iv_drip, /obj/effect/floor_decal/corner_wide/green{ dir = 6 }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, /area/horizon/medical/equipment) "aqg" = ( @@ -4427,26 +4433,11 @@ /turf/simulated/floor/plating, /area/horizon/engineering/reactor/indra/mainchamber) "aCG" = ( -/obj/structure/table/wood, -/obj/machinery/button/switch/windowtint{ - dir = 4; - id = "psych"; - pixel_x = 21; - pixel_y = -9 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/device/flashlight/lamp/lava/pink{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/random/desktoy{ - pixel_x = -7; - pixel_y = 6 - }, -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) +/obj/machinery/firealarm/east, +/obj/structure/table/reinforced/glass, +/obj/structure/curtain/open/medical, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "aCQ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -4776,19 +4767,14 @@ /turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_3/central) "aFZ" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/closet/walllocker/firecloset/medical{ - pixel_x = -32 - }, -/obj/structure/engineer_maintenance/pipe{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/engineer_maintenance/electric, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/bed/stool/chair/padded/brown{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "aGa" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/steel, @@ -5292,19 +5278,25 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/lab) "aJe" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/machinery/power/apc/low/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/disposal/small{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "aJk" = ( /obj/structure/railing/mapped, /obj/structure/sign/directions/prop{ @@ -5787,15 +5779,14 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "aMI" = ( -/obj/structure/disposalpipe/trunk{ +/obj/effect/floor_decal/corner_wide/lime{ + dir = 5 + }, +/obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/disposal/small{ - dir = 4; - pixel_x = -12 - }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "aMJ" = ( /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -7693,16 +7684,16 @@ /obj/item/tank/oxygen, /obj/item/tank/oxygen, /obj/item/tank/oxygen, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "bbH" = ( @@ -9115,12 +9106,27 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/smes) "bms" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 +/obj/machinery/door/firedoor{ + dir = 4 }, -/obj/machinery/vending/coffee, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 + }, +/obj/effect/map_effect/door_helper/unres{ + dir = 8 + }, +/obj/machinery/door/airlock/medical{ + name = "Psychiatric Office"; + req_access = list(64); + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/psych) "bmu" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/cable/green{ @@ -10322,8 +10328,11 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/arrow/yellow{ + dir = 8 }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) @@ -10545,15 +10554,6 @@ /obj/structure/table/reinforced/wood, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/meeting_room) -"bwM" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/structure/bed/stool/chair/plastic{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) "bwO" = ( /obj/structure/railing/mapped{ dir = 4 @@ -12489,16 +12489,18 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/turbine) "bMG" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/bed/stool/chair/office/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "bMH" = ( /obj/effect/floor_decal/corner_wide/black/full{ dir = 1 @@ -12627,11 +12629,17 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "bNz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/railing/mapped, +/obj/structure/sign/greencross/small{ + pixel_x = -32; + pixel_y = -32 }, -/turf/simulated/wall, -/area/horizon/medical/ward) +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_2/central) "bNE" = ( /obj/structure/platform_stairs/south_north_solo, /obj/structure/platform{ @@ -12683,15 +12691,14 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenobiology/hazardous) "bNO" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/mech_recharger, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "bOb" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "holodecktint_a" @@ -13329,22 +13336,13 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/security/checkpoint2) "bSU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/machinery/door/airlock/glass_medical{ - dir = 4; - name = "Paramedic Quarters"; - req_access = list(67) - }, -/turf/simulated/floor/tiled/full, -/area/horizon/medical/paramedic) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "bSV" = ( /obj/machinery/light/small/emergency, /obj/effect/floor_decal/industrial/warning{ @@ -16026,15 +16024,13 @@ /turf/space/dynamic, /area/horizon/exterior) "cnJ" = ( -/obj/structure/curtain/open/medical, -/obj/structure/bed/stool/padded/red{ - dir = 8 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "cnN" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -20585,15 +20581,8 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "cTc" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/medical/ward) "cTn" = ( /obj/structure/bed/stool, @@ -23033,13 +23022,11 @@ /turf/simulated/floor/reinforced, /area/horizon/engineering/gravity_gen) "dkp" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/closet/secure_closet/medical_para, -/obj/item/defibrillator/compact/loaded, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/bed/psych, +/obj/random/plushie, +/obj/machinery/alarm/north, +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "dkt" = ( /obj/machinery/alarm/west, /turf/simulated/floor/tiled, @@ -23082,26 +23069,20 @@ /turf/unsimulated/floor, /area/centcom/holding) "dkZ" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 }, -/obj/machinery/disposal/small/east, -/obj/structure/disposalpipe/trunk{ +/obj/structure/engineer_maintenance/electric, +/obj/machinery/power/apc/low/west, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/button/switch/windowtint{ - dir = 8; - id = "Recovery1"; - pixel_y = -2; - pixel_x = -22 +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = -22; - pixel_y = 10 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "dlb" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23530,14 +23511,11 @@ /turf/simulated/floor/reinforced, /area/horizon/rnd/xenobiology) "dnG" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 4 +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 }, -/obj/effect/landmark/start{ - name = "Psychiatrist" - }, -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "doc" = ( /obj/machinery/light{ dir = 4 @@ -23726,10 +23704,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/power/apc/east, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/structure/engineer_maintenance/electric{ dir = 4 }, @@ -25084,11 +25058,17 @@ /turf/unsimulated/floor, /area/antag/ninja) "dyo" = ( -/obj/structure/bed/stool/chair/sofa/right/brown{ +/obj/structure/bed/stool/chair/office/light{ dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 + }, +/obj/machinery/light/floor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/medical/ward) "dyy" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/bed/stool/chair/office/dark, @@ -26195,15 +26175,16 @@ /turf/simulated/floor/tiled/dark, /area/horizon/rnd/xenoarch/storage) "dFT" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/random/loot, +/obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 4 - }, -/obj/machinery/vending/mredispenser, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/holodeck) "dFW" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -28109,20 +28090,21 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "dUD" = ( -/obj/item/bedsheet/medical, -/obj/structure/bed/padded, -/obj/effect/floor_decal/corner_wide/green/full{ +/obj/item/rig/medical/equipped{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/rig/medical/equipped{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/structure/table/rack, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Examination Office 1" - }, -/obj/machinery/newscaster/east{ - dir = 8; - pixel_x = -8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/paramedic) "dUH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28538,19 +28520,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/engineering/reactor/supermatter/airlock) "dYk" = ( -/obj/structure/table/wood, -/obj/machinery/requests_console/east{ - department = "Psychiatric Wing" - }, -/obj/item/modular_computer/laptop/preset/medical{ - pixel_y = 4 - }, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 14 - }, -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/bed/padded, +/obj/item/bedsheet/medical, +/obj/item/device/radio/intercom/east, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "dYF" = ( /obj/effect/floor_decal/industrial/outline/service, /obj/structure/closet/secure_closet/hydroponics, @@ -29898,13 +29873,11 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid) "egG" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "egI" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 4 @@ -31121,19 +31094,10 @@ }, /area/centcom/specops) "eqd" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, +/obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/door/airlock/maintenance{ - dir = 1; - req_one_access = list(5,12) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "eqg" = ( /obj/machinery/flasher{ id = "permflash" @@ -31546,9 +31510,19 @@ /turf/space/dynamic, /area/horizon/exterior) "etV" = ( -/obj/machinery/newscaster/east, -/turf/simulated/floor/carpet, -/area/horizon/hallway/primary/deck_2/starboard) +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "Medical Lockdown Shutters"; + opacity = 0 + }, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "recovery" + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/ward) "etZ" = ( /obj/item/device/radio/intercom/north{ broadcasting = 1; @@ -32835,7 +32809,6 @@ /turf/simulated/floor/tiled/dark, /area/horizon/weapons/grauwolf) "eDG" = ( -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -32848,13 +32821,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/airlock/glass_medical{ dir = 4; - name = "Recovery"; - req_access = list(5) + name = "Paramedic Quarters"; + req_access = list(67) }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/paramedic) "eDQ" = ( /turf/unsimulated/floor/monotile, /area/antag/burglar) @@ -33743,21 +33720,19 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "eKK" = ( -/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/bed/stool/chair/office/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "eKN" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning{ @@ -33983,6 +33958,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/bluespace_drive) "eMD" = ( +/obj/structure/platform/ledge, /obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) @@ -34912,6 +34888,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "eTK" = ( @@ -36797,16 +36776,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/turbine) "fhN" = ( -/obj/item/folder, -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/obj/structure/curtain/open/medical, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/closet/secure_closet/medical_para, +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/paramedic) "fhQ" = ( /obj/effect/floor_decal/corner_wide/black{ dir = 6 @@ -37747,12 +37720,18 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos) "fpl" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "fpn" = ( /obj/structure/shuttle_part/ert{ icon_state = "3,0"; @@ -38827,9 +38806,11 @@ /turf/simulated/floor/wood, /area/horizon/command/heads/om) "fxO" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/random/pottedplant, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/central) "fxS" = ( /obj/machinery/door/airlock/external{ @@ -39624,19 +39605,26 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/conference) "fDJ" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/obj/item/device/radio/intercom/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "fDN" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -40202,15 +40190,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "fIE" = ( @@ -40951,6 +40940,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "fNI" = ( @@ -41618,15 +41611,31 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/operations/machinist/surgicalbay) "fSk" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/bed/stool/chair/office/light{ - dir = 8 +/obj/structure/table/wood, +/obj/random/pottedplant_small{ + pixel_x = 9; + pixel_y = 9 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/light_switch{ + dir = 10; + pixel_y = -5; + pixel_x = -4 + }, +/obj/machinery/button/switch/windowtint{ + dir = 10; + id = "psych"; + pixel_x = 6; + pixel_y = -5 + }, +/obj/random/desktoy{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "fSm" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/orange{ @@ -42983,12 +42992,14 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + sortType = "Psychiatry"; + name = "Psychiatry" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "gbk" = ( @@ -43021,9 +43032,21 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/reactor/indra/smes) "gbt" = ( -/obj/structure/bed/stool/chair/sofa/left/brown, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/structure/table/reinforced/steel, +/obj/item/folder/white{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/folder/white{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/random/pottedplant_small{ + pixel_x = 9; + pixel_y = -7 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/ward) "gby" = ( /obj/structure/bed/stool/chair/sofa/brown{ dir = 1 @@ -43397,10 +43420,12 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/weapons/longbow) "geu" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/stool/chair/padded/beige{ - dir = 4 +/obj/structure/table/wood, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 6 }, +/obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/starboard) "gev" = ( @@ -47925,15 +47950,13 @@ }, /area/horizon/engineering/atmos/propulsion) "gMm" = ( -/obj/machinery/firealarm/south, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/light, -/obj/structure/closet/secure_closet/psychiatric, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "gMq" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /obj/machinery/door/blast/shutters{ @@ -49130,10 +49153,19 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/rnd/xenobiology/xenoflora) "gVC" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/mech_recharger, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "gVD" = ( /obj/machinery/door/blast/regular/open{ dir = 4; @@ -49423,18 +49455,14 @@ /turf/simulated/floor/shuttle/dark_blue, /area/horizon/shuttle/escape_pod/pod1) "gXd" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/table/reinforced/steel, +/obj/item/device/hand_labeler{ + pixel_x = 3; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/closet/secure_closet/personal/patient, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "gXe" = ( /obj/structure/railing/mapped{ name = "adjusted railing" @@ -50573,6 +50601,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "hfe" = ( @@ -50600,8 +50629,15 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "hfi" = ( -/turf/simulated/floor/wood, -/area/horizon/hallway/primary/deck_2/starboard) +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 + }, +/obj/machinery/disposal/small/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "hfj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -50621,21 +50657,13 @@ /turf/simulated/floor/lino, /area/horizon/service/bar) "hfm" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 2 +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 }, -/obj/item/pen{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/random/pottedplant_small{ - pixel_x = 9; - pixel_y = 1 - }, -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/iv_drip, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "hfw" = ( /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, @@ -50988,7 +51016,6 @@ /obj/effect/floor_decal/corner_wide/green/full{ dir = 1 }, -/obj/effect/floor_decal/sign/paramedic, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -51001,6 +51028,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/sign/p, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "hiE" = ( @@ -51312,15 +51343,15 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/maintenance/deck_1/operations/starboard/far) "hlb" = ( -/obj/machinery/power/apc/low/east, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/bed/padded, +/obj/item/bedsheet/medical, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/machinery/power/apc/east, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "hld" = ( /obj/machinery/door/blast/shutters/open{ id = "CHE2shutters"; @@ -51841,13 +51872,9 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/conference) "hom" = ( -/obj/effect/floor_decal/corner/dark_green/full{ - dir = 4 - }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/hallway/fore) "hoo" = ( /obj/machinery/vending/cola{ @@ -51967,18 +51994,29 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "hpp" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, +/obj/machinery/requests_console/east{ + department = "Paramedic Bay" }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 +/obj/item/device/radio/med{ + pixel_x = -6; + pixel_y = 6 }, -/obj/structure/bed/stool/chair/office/dark{ - dir = 4 +/obj/item/device/radio/med{ + pixel_x = 6; + pixel_y = 6 }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/item/device/gps/medical{ + pixel_x = -7 + }, +/obj/item/device/gps/medical{ + pixel_x = 5 + }, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "hpt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -52833,9 +52871,14 @@ }, /area/shuttle/syndicate_elite) "huH" = ( -/obj/effect/floor_decal/corner/dark_green, -/turf/simulated/floor/tiled, -/area/horizon/engineering/hallway/fore) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "huI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -53691,10 +53734,10 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "hBp" = ( -/obj/structure/flora/pottedplant{ - icon_state = "plant-33" - }, -/turf/simulated/floor/wood, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_2/starboard) "hBr" = ( /obj/item/device/flashlight/lamp, @@ -53791,6 +53834,7 @@ /obj/structure/platform/ledge{ dir = 1 }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "hCp" = ( @@ -53942,7 +53986,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/monitoring) "hDr" = ( -/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/stool/chair/padded/beige, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, /turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/starboard) "hDs" = ( @@ -54496,15 +54543,26 @@ /turf/simulated/floor/tiled, /area/horizon/engineering/locker_room) "hGY" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/power/apc/low/west, /obj/structure/cable/green{ - icon_state = "0-2" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "hGZ" = ( /obj/effect/floor_decal/corner/teal/full{ dir = 4 @@ -54718,6 +54776,7 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/horizon/medical/gen_treatment) "hIm" = ( @@ -55406,8 +55465,20 @@ /turf/unsimulated/floor/wood, /area/centcom/bar) "hMH" = ( -/turf/simulated/floor/carpet, -/area/horizon/hallway/primary/deck_2/starboard) +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "Medical Lockdown Shutters"; + opacity = 0 + }, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "recovery" + }, +/obj/structure/sign/greencross/small, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/ward) "hMK" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -56063,14 +56134,13 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_1/wing/starboard) "hRL" = ( -/obj/structure/bed/psych, -/obj/machinery/light_switch{ - pixel_x = -13; - pixel_y = 20 +/obj/machinery/door/airlock/glass_medical{ + name = "Paramedic Quarters"; + req_access = list(67) }, -/obj/random/plushie, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/paramedic) "hRP" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/effect/map_effect/marker/airlock/docking{ @@ -57491,11 +57561,12 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/engineering/deck_2) "iec" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner_wide/lime/full{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/effect/landmark/latejoinmedbayrecovery, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "ieh" = ( /obj/structure/lattice/catwalk, /obj/structure/sign/drop{ @@ -61355,14 +61426,11 @@ /turf/unsimulated/floor/dark_monotile, /area/antag/actor) "iFK" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 +/obj/structure/table/reinforced/steel, +/obj/item/storage/toolbox/emergency{ + pixel_y = 2 }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/hallway/fore) "iFM" = ( /obj/structure/table/fancy, @@ -62055,19 +62123,13 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "iMl" = ( -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/obj/structure/curtain/open/medical, -/obj/item/folder, +/obj/machinery/suit_cycler/medical, +/obj/effect/floor_decal/industrial/outline/medical, /obj/machinery/light{ - dir = 1 + dir = 4 }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/paramedic) "iMp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -62909,14 +62971,14 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/medical{ - dir = 1; - name = "Psychiatric Office"; - req_access = list(64) - }, /obj/effect/map_effect/door_helper/unres, +/obj/machinery/door/airlock/glass_medical{ + dir = 1; + name = "Recovery Ward"; + req_access = list(5) + }, /turf/simulated/floor/tiled/full, -/area/horizon/medical/psych) +/area/horizon/medical/ward) "iTd" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 6 @@ -62950,7 +63012,6 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "iTp" = ( -/obj/machinery/iv_drip, /obj/effect/floor_decal/corner_wide/green/full{ dir = 4 }, @@ -65362,12 +65423,9 @@ /turf/simulated/open, /area/horizon/engineering/break_room) "jkX" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/stool/chair, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/central) "jkY" = ( /obj/structure/platform{ @@ -65709,10 +65767,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/sortjunction/flipped{ +/obj/structure/disposalpipe/junction{ dir = 8; - name = "Psychiatry"; - sortType = "Psychiatry" + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) @@ -69800,8 +69857,12 @@ }, /area/centcom/holding) "jRz" = ( -/obj/structure/platform/ledge, -/turf/simulated/open, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "jRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -72721,14 +72782,24 @@ /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/robotics_lift) "kmu" = ( +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "kmv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -72861,10 +72932,15 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "knC" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) +/obj/machinery/alarm/east, +/obj/structure/table/reinforced/glass, +/obj/random/pottedplant_small{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/structure/curtain/open/medical, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "knL" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -82210,13 +82286,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) -"lCz" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 - }, -/obj/machinery/vending/lavatory, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) "lCB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -82462,6 +82531,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 4 + }, +/obj/effect/floor_decal/sign/paramedic, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "lDN" = ( @@ -82715,13 +82788,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenoarch/atrium) "lFm" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "lFp" = ( /obj/structure/bed/stool/chair/unmovable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -83386,6 +83459,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/horizon/medical/gen_treatment) "lKd" = ( @@ -83918,25 +83995,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "lOo" = ( -/obj/structure/engineer_maintenance/electric{ - dir = 8 - }, -/obj/structure/engineer_maintenance/pipe{ - dir = 1 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, -/obj/random/pottedplant, -/obj/machinery/requests_console/north{ - pixel_y = 32; - pixel_x = -1; - name = "Recovery Ward requests console"; - department = "Recovery Ward"; - departmentType = 2 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/primary/deck_2/starboard) "lOs" = ( /obj/effect/floor_decal/corner/yellow, /obj/effect/floor_decal/corner{ @@ -84970,9 +85032,6 @@ }, /turf/simulated/floor/holofloor/carpet/rubber, /area/horizon/holodeck/source_basketball) -"lXN" = ( -/turf/simulated/floor/carpet, -/area/horizon/medical/psych) "lXO" = ( /obj/machinery/mech_recharger, /obj/effect/floor_decal/corner/dark_blue{ @@ -85499,12 +85558,12 @@ /turf/unsimulated/floor, /area/antag/raider) "mbC" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/fore) "mbD" = ( @@ -89530,11 +89589,9 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "mKk" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "Recovery1" - }, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, -/area/horizon/medical/ward) +/area/horizon/medical/paramedic) "mKl" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -90420,22 +90477,12 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid/interstitial) "mRN" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 - }, -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/obj/item/modular_computer/laptop/preset/medical{ - pixel_y = 4 - }, -/obj/machinery/button/remote/airlock{ - id = "RecoveryWard"; - name = "Recovery Door Control"; - pixel_x = -7; - pixel_y = -19; - req_access = list(5) +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/horizon/medical/ward) "mRO" = ( @@ -91874,7 +91921,7 @@ "ndb" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall, -/area/horizon/medical/ward) +/area/horizon/medical/paramedic) "ndh" = ( /obj/structure/shuttle_part/scc/mining{ icon_state = "4,10"; @@ -91945,30 +91992,15 @@ /turf/simulated/floor/carpet, /area/horizon/repoffice/representative_one) "ndE" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/item/storage/belt/medical/paramedic, -/obj/item/storage/belt/medical/paramedic, -/obj/machinery/alarm/south, -/obj/machinery/requests_console/east{ - department = "Paramedic Bay" +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/obj/item/device/radio/med{ - pixel_x = -6; - pixel_y = 6 +/obj/item/modular_computer/laptop/preset/medical{ + pixel_y = 11 }, -/obj/item/device/radio/med{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/device/gps/medical{ - pixel_x = -7 - }, -/obj/item/device/gps/medical{ - pixel_x = 5 - }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "ndF" = ( /obj/structure/platform/cutout, /obj/structure/platform_stairs/full/east_west_cap{ @@ -92280,10 +92312,10 @@ opacity = 0 }, /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "psych" + id = "recovery" }, /turf/simulated/floor/tiled/dark/full, -/area/horizon/medical/psych) +/area/horizon/medical/ward) "nfJ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -94353,9 +94385,11 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/starboard) @@ -94822,6 +94856,7 @@ /obj/structure/platform/ledge{ dir = 8 }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "nyB" = ( @@ -95049,18 +95084,20 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/substation/xenoarchaeology) "nBc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "nBg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -95149,18 +95186,18 @@ /turf/simulated/wall, /area/horizon/service/hydroponics) "nBN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - First Responder Room"; dir = 8 }, -/obj/structure/bed/stool/padded/red{ - dir = 8 - }, -/obj/structure/curtain/open/medical, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/alarm/east, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "nBQ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -95550,18 +95587,12 @@ /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "nDQ" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/mirror{ - pixel_x = 27 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 13 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/holodeck) "nDR" = ( /obj/machinery/cryopod, /turf/simulated/floor/carpet/cyan, @@ -96465,18 +96496,14 @@ /turf/simulated/floor/plating, /area/horizon/engineering/break_room) "nKo" = ( -/obj/machinery/alarm/north{ - dir = 4; - pixel_y = 3; - pixel_x = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/cryopod, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/computer/cryopod/living_quarters{ - pixel_y = 32 +/obj/machinery/light/small/emergency{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/ward) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/holodeck) "nKp" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -97737,7 +97764,9 @@ /turf/simulated/floor/carpet, /area/horizon/command/heads/captain) "nUK" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -98373,18 +98402,13 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "oaA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable/green, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/latejoinmedbayrecovery, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/bed/stool/chair, +/turf/simulated/floor/wood, +/area/horizon/hallway/primary/deck_2/central) "oaC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -98488,10 +98512,16 @@ /turf/simulated/floor/plating, /area/horizon/engineering/reactor/supermatter/mainchamber) "obk" = ( -/obj/machinery/alarm/east, -/obj/random/pottedplant, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/machinery/light{ + dir = 4 + }, +/obj/random/desktoy{ + pixel_y = 9 + }, +/obj/structure/table/reinforced/glass, +/obj/structure/curtain/open/medical, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "obl" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -100191,17 +100221,12 @@ /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) "olD" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/railing/mapped{ - dir = 8 +/obj/structure/bed/stool/chair/padded/beige, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/grass/no_edge, +/obj/machinery/alarm/north, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/starboard) "olF" = ( /obj/machinery/door/airlock/glass_centcom{ @@ -100904,8 +100929,10 @@ }, /area/antag/ninja) "oqq" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) "oqt" = ( @@ -105314,10 +105341,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/port) "oWS" = ( -/obj/structure/bed/stool/chair/padded/beige{ - dir = 4 +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/effect/floor_decal/industrial/arrow/yellow, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/starboard) "oWV" = ( /obj/effect/floor_decal/corner/red{ @@ -105591,13 +105620,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) "oYK" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/railing/mapped, -/obj/structure/sign/greencross/small{ - pixel_x = -32; - pixel_y = -32 +/obj/effect/floor_decal/spline/fancy/wood, +/obj/random/pottedplant_small{ + pixel_x = 8; + pixel_y = 5 }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/table/wood, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/central) "oYM" = ( /obj/structure/disposalpipe/segment, @@ -106859,25 +106888,27 @@ /turf/simulated/open, /area/horizon/service/custodial/disposals/deck_2) "pjt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - dir = 4; - name = "Psychiatric Office"; - req_access = list(64) - }, /obj/effect/map_effect/door_helper/unres{ dir = 4 }, /obj/machinery/door/blast/shutters{ density = 0; - dir = 2; + dir = 8; icon_state = "shutter0"; id = "LCKDshutters"; name = "Medical Lockdown Shutters"; opacity = 0 }, +/obj/machinery/door/airlock/medical{ + name = "Recovery Ward"; + req_access = list(5); + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/full, -/area/horizon/medical/psych) +/area/horizon/medical/ward) "pjw" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/beach/sand, @@ -109922,14 +109953,16 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "pGO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/corner_wide/lime{ + dir = 9 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "4-8"; + d1 = 4; + d2 = 8 }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "pGS" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/grille/firedoor{ id = "cap" @@ -111195,9 +111228,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 4 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/horizon/medical/cryo) "pRN" = ( @@ -111810,10 +111841,14 @@ /turf/unsimulated/floor/plating, /area/shuttle/transport1) "pWU" = ( -/obj/structure/lattice, +/obj/structure/platform/ledge, /obj/structure/platform/ledge{ dir = 4 }, +/obj/structure/platform_deco/ledge{ + dir = 5 + }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "pWW" = ( @@ -113122,9 +113157,11 @@ name = "MedBay Lockdown Shutters"; opacity = 0 }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "psych" + }, /turf/simulated/floor/tiled/dark/full, -/area/horizon/medical/paramedic) +/area/horizon/medical/psych) "qgT" = ( /turf/simulated/wall/r_wall, /area/horizon/engineering/gravity_gen) @@ -113349,24 +113386,23 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/engineering/reactor/indra/mainchamber) "qjR" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/item/reagent_containers/hypospray{ - pixel_x = -2; - pixel_y = 5 +/obj/structure/bed/stool/chair/office/dark{ + dir = 4 }, -/obj/item/reagent_containers/hypospray{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/landmark/start{ + name = "Psychiatrist" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "qjW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -116798,12 +116834,10 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "qJr" = ( -/obj/structure/table/wood, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = 6 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/starboard) "qJv" = ( /obj/effect/decal/rolling_fog, @@ -117156,6 +117190,9 @@ /obj/effect/floor_decal/corner/beige/full{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/horizon/medical/gen_treatment) "qLX" = ( @@ -118471,14 +118508,11 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "qWM" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/item/modular_computer/console/preset/medical{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/stool/chair/plastic{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled/full, /area/horizon/medical/ward) "qWO" = ( /obj/effect/floor_decal/corner/purple{ @@ -119204,17 +119238,11 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/ward/isolation) "rcB" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 - }, -/obj/machinery/computer/ship/navigation{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "rcE" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -120993,19 +121021,16 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "roK" = ( -/obj/machinery/alarm/north, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 +/obj/machinery/door/airlock/maintenance{ + dir = 4; + req_access = list(67) }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); dir = 4 }, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass/no_edge, -/area/horizon/hallway/primary/deck_2/starboard) +/turf/simulated/floor/tiled/full, +/area/horizon/medical/paramedic) "roS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -121935,9 +121960,14 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "rwn" = ( +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "rwq" = ( /obj/structure/trash_pile, /turf/simulated/floor/plating, @@ -123059,12 +123089,29 @@ /turf/unsimulated/floor, /area/antag/jockey) "rEU" = ( -/obj/structure/bed/stool/chair/sofa/corner/concave/brown{ +/obj/effect/floor_decal/industrial/outline/medical, +/obj/machinery/requests_console/north{ + pixel_y = 0; + pixel_x = -32; + name = "Recovery Ward requests console"; + department = "Recovery Ward"; + departmentType = 2 + }, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Recovery Room"; dir = 4 }, -/obj/machinery/newscaster/west, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/structure/closet/secure_closet/medical/empty{ + name = "recovery supplies" + }, +/obj/item/clothing/under/medical_gown/white, +/obj/item/clothing/under/medical_gown/white, +/obj/item/clothing/under/medical_gown/white, +/obj/item/clothing/under/medical_gown, +/obj/item/clothing/under/medical_gown, +/obj/item/clothing/under/medical_gown, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/ward) "rEY" = ( /obj/structure/grille, /obj/machinery/door/blast/regular{ @@ -128569,19 +128616,14 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "sst" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "Medical Lockdown Shutters"; - opacity = 0 +/obj/effect/floor_decal/industrial/outline/medical, +/obj/machinery/light{ + dir = 4 }, -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "psych" - }, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/medical/psych) +/obj/structure/bed/padded, +/obj/item/bedsheet/medical, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "ssw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -130841,15 +130883,10 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "sIs" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/firealarm/south, -/obj/structure/table/standard, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/closet/secure_closet/psychiatric, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "sIw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, @@ -131183,25 +131220,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/weapons/grauwolf) "sKL" = ( -/obj/machinery/door/airlock/medical{ - dir = 1; - name = "Psychiatric Office"; - req_access = list(64) +/obj/effect/floor_decal/corner_wide/lime{ + dir = 6 }, -/obj/machinery/door/firedoor, -/obj/effect/map_effect/door_helper/unres{ - dir = 1 +/obj/structure/bed/stool/chair/office/light{ + dir = 8 }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "Medical Lockdown Shutters"; - opacity = 0 - }, -/turf/simulated/floor/tiled/full, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "sKR" = ( /obj/effect/floor_decal/corner{ dir = 6 @@ -132272,16 +132298,16 @@ /turf/simulated/floor/carpet, /area/shuttle/skipjack) "sSb" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 }, -/obj/random/pottedplant, -/obj/structure/engineer_maintenance/electric, -/obj/structure/engineer_maintenance/pipe{ - dir = 8 +/obj/machinery/hologram/holopad, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/turf/simulated/floor/tiled, +/area/horizon/medical/ward) "sSc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -132364,9 +132390,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/mainchamber) "sSD" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "Recovery1" - }, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -132375,8 +132398,9 @@ name = "Medical Lockdown Shutters"; opacity = 0 }, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, -/area/horizon/medical/ward) +/area/horizon/medical/paramedic) "sSF" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, @@ -132555,18 +132579,20 @@ /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) "sUI" = ( -/obj/effect/floor_decal/corner/dark_green/full, -/obj/structure/table/standard, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 1 +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "Medical Lockdown Shutters"; + opacity = 0 }, -/obj/item/pen{ - pixel_x = 2; - pixel_y = 3 +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "recovery" }, -/turf/simulated/floor/tiled, -/area/horizon/engineering/hallway/fore) +/obj/structure/sign/greencross/small, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/medical/ward) "sUQ" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -132689,15 +132715,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/door/airlock/glass_medical{ - dir = 4; - name = "Paramedic Quarters"; - req_access = list(67) +/obj/machinery/door/firedoor{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/door/airlock/medical{ + name = "Psychiatric Office"; + req_access = list(64); + dir = 4 + }, +/obj/effect/map_effect/door_helper/unres{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/psych) "sVE" = ( /obj/structure/table/reinforced/steel, /obj/item/gun/custom_ka/frame01/illegal{ @@ -134874,26 +134907,16 @@ /turf/simulated/floor/plating, /area/horizon/shuttle/canary) "tlJ" = ( -/obj/item/rig/medical/equipped{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/item/rig/medical/equipped{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/structure/window/reinforced{ +/obj/random/pottedplant, +/obj/machinery/light{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/rack{ - pixel_y = 5 - }, -/obj/machinery/door/window/southleft, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/engineer_maintenance/electric/wall, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "tlM" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -135495,11 +135518,28 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/mercenary) "tqg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/reinforced/steel, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 7 }, -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/item/pen/fountain{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/machinery/button/switch/windowtint{ + dir = 10; + id = "recovery"; + pixel_y = 12; + pixel_x = 9 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 8; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/ward) "tqj" = ( /obj/item/storage/box/fancy/candle_box{ icon_state = "candlepack5" @@ -135939,11 +135979,33 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "ttn" = ( -/obj/machinery/light{ +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/unres{ dir = 1 }, -/turf/simulated/floor/carpet, -/area/horizon/hallway/primary/deck_2/starboard) +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "Medical Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/airlock/medical{ + name = "Recovery Ward"; + req_access = list(5); + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "Medical Lockdown Shutters"; + opacity = 0 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/medical/ward) "tto" = ( /obj/item/gun/launcher/grenade{ pixel_x = -2; @@ -137820,6 +137882,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "tGn" = ( @@ -138328,11 +138394,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/sign/p, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/sign/p, +/obj/effect/floor_decal/industrial/outline_straight/yellow, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) "tKk" = ( @@ -139896,12 +139961,12 @@ }, /area/centcom/ferry) "tXx" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "tXC" = ( /obj/structure/bed/stool/chair/office/light{ dir = 8 @@ -140086,18 +140151,13 @@ name = "Medical Lockdown Shutters"; opacity = 0 }, -/obj/machinery/door/airlock/medical{ - dir = 1; - name = "Recovery"; - req_access = list(5); - id_tag = "RecoveryWard" - }, /obj/machinery/door/firedoor, -/obj/effect/map_effect/door_helper/unres{ - dir = 1 +/obj/machinery/door/airlock/maintenance{ + dir = 1; + req_one_access = list(5,12) }, /turf/simulated/floor/tiled/full, -/area/horizon/medical/ward) +/area/horizon/hallway/primary/deck_3/starboard) "tZd" = ( /obj/structure/table/rack/retail_shelf, /obj/random/pottedplant_small{ @@ -140303,12 +140363,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/structure/engineer_maintenance/electric{ - dir = 8 - }, /obj/structure/engineer_maintenance/electric{ dir = 1 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/hallway/primary/deck_2/central) "uaw" = ( @@ -141295,16 +141355,23 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/port) "uhd" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/reinforced/steel, +/obj/item/storage/toolbox/mechanical{ + pixel_y = -12 }, -/obj/structure/table/standard, -/obj/item/deck/kotahi{ +/obj/item/reagent_containers/hypospray{ pixel_x = -2; - pixel_y = 4 + pixel_y = 5 }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/item/reagent_containers/hypospray{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/device/radio/intercom/east, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "uhr" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -145634,10 +145701,9 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "uLX" = ( -/obj/structure/bed/stool/chair/padded/beige{ - dir = 8 - }, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/random/pottedplant, +/turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_2/starboard) "uMb" = ( /obj/machinery/hologram/holopad, @@ -146008,6 +146074,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/newscaster/west, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/starboard) "uPr" = ( @@ -149366,6 +149433,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "vma" = ( @@ -149782,13 +149852,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) "voS" = ( -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - First Responder Room" +/obj/structure/bed/stool/chair/sofa/right/brown, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/structure/closet/secure_closet/medical_para, -/obj/item/defibrillator/compact/loaded, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/machinery/power/apc/north, +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "voU" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 10 @@ -149803,22 +149874,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/operations/lobby) "vpk" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/closet/secure_closet/personal/patient, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "vps" = ( /obj/structure/table/reinforced/steel, /obj/machinery/light/small{ @@ -149989,13 +150047,8 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "vqm" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "vqn" = ( /obj/effect/floor_decal/corner/grey{ dir = 6 @@ -150605,15 +150658,19 @@ /turf/unsimulated/floor, /area/antag/raider) "vuQ" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/closet/walllocker/medical/secure{ + name = "Stabilization Kit"; + pixel_x = -31 }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 - }, -/obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/storage/pill_bottle/mortaphenyl, +/obj/item/storage/pill_bottle/mortaphenyl, +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "vuR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -151445,16 +151502,15 @@ }, /area/centcom/specops) "vAN" = ( -/obj/item/device/radio/intercom/north{ - dir = 8; - pixel_y = 0; - pixel_x = -7 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 +/obj/structure/closet/walllocker/firecloset/medical{ + pixel_x = -32 }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "vAT" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 9 @@ -151634,6 +151690,12 @@ /area/horizon/weapons/grauwolf) "vBZ" = ( /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_2/starboard) "vCe" = ( @@ -153440,9 +153502,13 @@ /turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "vPn" = ( -/obj/machinery/suit_cycler/medical, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/bed/stool/chair/sofa/corner/concave/brown, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "vPs" = ( /obj/structure/bed/stool/chair/shuttle{ dir = 4 @@ -153939,7 +154005,6 @@ /turf/unsimulated/floor/monotile, /area/antag/raider) "vTx" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner_wide/paleblue{ dir = 1 }, @@ -153947,6 +154012,9 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) "vTz" = ( @@ -155005,6 +155073,7 @@ /obj/structure/platform_deco/ledge{ dir = 10 }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "wae" = ( @@ -156001,7 +156070,12 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/arrow/yellow{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/starboard) "whb" = ( @@ -156278,13 +156352,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/mainchamber) "wjj" = ( -/obj/machinery/firealarm/north, /obj/effect/floor_decal/corner/dark_green/full{ dir = 8 }, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "wjn" = ( @@ -162133,6 +162205,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "wVY" = ( @@ -163484,14 +163560,12 @@ /turf/simulated/floor/lino, /area/horizon/service/cafeteria) "xfr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "xfv" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -163795,21 +163869,22 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "xhH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/effect/floor_decal/corner/white/diagonal, /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/corner_wide/green/full, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/small/north, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "xhS" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -163948,8 +164023,12 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/starboard/deck_3) "xjd" = ( -/turf/simulated/floor/wood, -/area/horizon/medical/psych) +/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/medical/ward) "xjq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -164488,11 +164567,17 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/legion) "xoo" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/ward) +/obj/structure/table/reinforced/steel, +/obj/structure/roller_rack/two, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/medical/paramedic) "xor" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 1 @@ -164643,12 +164728,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ dir = 4; name = "Main Storage"; req_access = list(66) }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/main_storage) "xps" = ( @@ -164702,12 +164789,8 @@ /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/starboard) "xpO" = ( -/obj/effect/floor_decal/corner/dark_green/full, /obj/machinery/firealarm/south, -/obj/structure/engineer_maintenance/electric, -/obj/structure/engineer_maintenance/pipe{ - dir = 8 - }, +/obj/effect/floor_decal/corner/dark_green/full, /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/fore) "xpR" = ( @@ -166615,18 +166698,23 @@ /turf/simulated/floor/wood, /area/horizon/repoffice/representative_two) "xEl" = ( -/obj/structure/closet/walllocker/medical/secure{ - name = "Stabilization Kit"; - pixel_x = -31 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/storage/pill_bottle/mortaphenyl, -/obj/item/storage/pill_bottle/mortaphenyl, -/obj/effect/floor_decal/corner/white/diagonal, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp/lava/pink{ + pixel_x = -7; + pixel_y = 13 + }, +/obj/random/desktoy{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/requests_console/west{ + department = "Psychiatric Wing" + }, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "xEs" = ( /obj/machinery/fusion_fuel_injector/mapped{ dir = 4; @@ -167778,10 +167866,28 @@ /turf/simulated/floor/tiled, /area/horizon/command/bridge/upperdeck) "xMo" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/medical, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 +/obj/machinery/computer/cryopod/living_quarters{ + pixel_x = -30; + pixel_y = 6 + }, +/obj/structure/table/steel, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass{ + pixel_x = 8; + pixel_y = 15 + }, +/obj/item/deck/kotahi{ + pixel_x = 8 }, /turf/simulated/floor/tiled/white, /area/horizon/medical/ward) @@ -168235,15 +168341,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/brig) "xQO" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/structure/bed/stool/chair/sofa/left/brown{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/turf/simulated/floor/carpet/green, +/area/horizon/medical/psych) "xQS" = ( /obj/structure/shuttle_part/scc/scout{ icon_state = "7,6" @@ -170859,11 +170961,22 @@ }, /area/centcom/evac) "yks" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/structure/roller_rack/two, -/turf/simulated/floor/tiled, -/area/horizon/medical/paramedic) +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/random/pottedplant_small{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/horizon/medical/psych) "ykx" = ( /obj/structure/platform{ dir = 4 @@ -262685,8 +262798,8 @@ dgF tWH gcV ivo -mDU -mDU +lOo +hBp vBZ dCg mDU @@ -263196,14 +263309,14 @@ wsR uIA jBq jNF -qap -qap -nfF +pUc +pUc nfF +sUI pjt nfF -jHa -roK +pUc +pUc olD gEF pig @@ -263453,14 +263566,14 @@ lqK csw une tuU -ulh +cTc rEU dyo sSb xjd aMI -sst -hBp +xMo +etV geu gEF pig @@ -263710,14 +263823,14 @@ fsf lrw nMe sSx -ulh +cTc gbt tqg -xjd +qWM xjd iec sKL -hfi +etV hDr gEF stG @@ -263970,10 +264083,10 @@ tKd iSU kmu nBc -rwn +mRN rwn gMm -jHa +bSU ttn oWS rHW @@ -264224,13 +264337,13 @@ jid uvb lyV uIW -ulh -hRL +cTc +hfm pGO -lXN +hfm dnG hfm -sst +hfi hMH qJr tvJ @@ -264481,7 +264594,7 @@ jid uvb qCk csf -ulh +cTc obk hlb aCG @@ -266534,7 +266647,7 @@ bbF sod mXO nlj -tRI +uma fIo fSY xjz @@ -267553,14 +267666,14 @@ tCa jDJ lQY fJT -rrG -rrG -rrG -rrG -eVP -eVP +stI +jHa +jHa +jHa +jHa +ulh sVD -qHI +jHa qHI qHI xpp @@ -267810,14 +267923,14 @@ vMA wcq mJH mbC -sUI -eVP +hom +jHa tlJ aFZ xEl aJe fDJ -qHI +jHa tiz xkk pla @@ -268066,15 +268179,15 @@ tin tCa jDJ lQY -aOw +fJT iFK -eVP +jHa dkp vqm egG eKK sIs -qHI +jHa wee mqS wlP @@ -268323,15 +268436,15 @@ mzZ tCa jDJ uef -huH +fJT hom -eVP +jHa voS lFm gVC qjR yks -qHI +jHa liO mqS rrg @@ -268581,14 +268694,14 @@ pIx gHS cPu nCD -whQ -eVP +stI +jHa vPn xQO -etg +huH fSk ndE -qHI +jHa gAg jms pKO @@ -268839,13 +268952,13 @@ ika uef eJH xpO -eVP -eVP -bSU -eVP +jHa +jHa qgS -eVP -qHI +bms +qgS +qgS +jHa qHI lIq lIq @@ -269099,10 +269212,10 @@ fJT fwY mlB oYK -wvd +bNz pWU yix -pWU +yix wad rmH vBg @@ -269355,11 +269468,11 @@ aOw fJT gvf mlB -fxO +oaA jRz eMD vKv -eMD +vKv hCo dvo njU @@ -269616,7 +269729,7 @@ jkX jRz eMD vKv -eMD +vKv hCo dvo rBm @@ -269870,10 +269983,10 @@ whQ stI mlB fxO -frH +jRz acv rkO -acv +rkO nyy dvo njU @@ -328988,14 +329101,14 @@ dsa itH mco eaj -pUc -pUc +eVP +eVP ndb -pUc -pUc -pUc +eVP +eVP +eVP eDG -pUc +eVP eem uqA mUh @@ -329505,11 +329618,11 @@ mco mKk fhN cnJ -xoo +rcB bNO fpl vpk -sSD +hRL oMa qga hkE @@ -329760,11 +329873,11 @@ itH mco itH mKk -xMo +fhN xfr tXx -qWM -tXx +etg +bMG gXd sSD oMa @@ -330019,7 +330132,7 @@ vyj mKk iMl nBN -xoo +eqd uhd xoo hpp @@ -330273,14 +330386,14 @@ rkE rkE fHu rkE -pUc -lOo -xoo -xoo -bwM -xoo -mRN -pUc +eVP +eVP +eVP +roK +eVP +eVP +eVP +eVP xPX xPX fsl @@ -330530,13 +330643,13 @@ mQc jMt qDM huk -eqd -oaA -bMG -bMG -bMG -bMG -cTc +jMt +jMt +jMt +jMt +jMt +jMt +jMt tYZ vhv jXQ @@ -330787,14 +330900,14 @@ hdU pUe bMn aKP -bNz +pUe nKo -rcB -lCz +pUe +aKP nDQ -bms +bMn dFT -pUc +bQm mgE gff kgW