diff --git a/code/__DEFINES/global.dm b/code/__DEFINES/global.dm index 1d4ecedfe97..cfbcb78adc0 100644 --- a/code/__DEFINES/global.dm +++ b/code/__DEFINES/global.dm @@ -68,6 +68,7 @@ GLOBAL_LIST_EMPTY(latejoin) GLOBAL_LIST_EMPTY(latejoin_cryo) GLOBAL_LIST_EMPTY(latejoin_cyborg) GLOBAL_LIST_EMPTY(latejoin_living_quarters_lift) +GLOBAL_LIST_EMPTY(latejoin_medbay_recovery) GLOBAL_LIST_EMPTY(kickoffsloc) GLOBAL_LIST_EMPTY(virtual_reality_spawn) diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 4db9b5a10e7..2d26f780403 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -598,12 +598,12 @@ SUBSYSTEM_DEF(jobs) . = spawnpos.msg spawnpos.after_join(H) else - to_chat(H, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") + to_chat(H, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the [SSatlas.current_map.default_spawn] instead.") H.forceMove(pick(GLOB.latejoin)) - . = "is inbound from the [SSatlas.current_map.dock_name]" + . = "is inbound from the [SSatlas.current_map.default_spawn]" else H.forceMove(pick(GLOB.latejoin)) - . = "is inbound from the [SSatlas.current_map.dock_name]" + . = "is inbound from the [SSatlas.current_map.default_spawn]" H.mind.selected_faction = SSjobs.GetFaction(H) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 4d5a2fca6b4..c6f3adc9f8b 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -71,7 +71,17 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) GLOB.latejoin_living_quarters_lift += get_turf(src) return INITIALIZE_HINT_QDEL +/** + * # Latejoin medbay marker + */ +/obj/effect/landmark/latejoinmedbayrecovery + invisibility = INVISIBILITY_ABSTRACT + +/obj/effect/landmark/latejoinmedbayrecovery/Initialize() + . = ..() + GLOB.latejoin_medbay_recovery += get_turf(src) + return INITIALIZE_HINT_QDEL /** * # Start marker diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm index 9c743b5cedb..f63fc56eb55 100644 --- a/code/modules/client/preferences_spawnpoints.dm +++ b/code/modules/client/preferences_spawnpoints.dm @@ -74,3 +74,23 @@ C.set_occupant(victim, 1) to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [SSatlas.current_map.station_name].")) return + +/datum/spawnpoint/medbay_recovery + display_name = "Medbay Recovery Ward" + msg = "has awoken in the Medbay Recovery Ward" + restrict_job = list("Off-Duty Crew Member", "Passenger") + +/datum/spawnpoint/medbay_recovery/New() + ..() + turfs = GLOB.latejoin_medbay_recovery + +/datum/spawnpoint/medbay_recovery/after_join(mob/victim) + if(!istype(victim)) + return + var/area/A = get_area(victim) + for(var/obj/machinery/cryopod/C in A) + if(!C.occupant) + C.set_occupant(victim, 1) + victim.Sleeping(3) + to_chat(victim, SPAN_NOTICE("You are slowly waking up from the medical cryostasis aboard [SSatlas.current_map.station_name]. It might take a few seconds.")) + return diff --git a/html/changelogs/flaminglily-recovery-spawn.yml b/html/changelogs/flaminglily-recovery-spawn.yml new file mode 100644 index 00000000000..6ad8177c3b8 --- /dev/null +++ b/html/changelogs/flaminglily-recovery-spawn.yml @@ -0,0 +1,59 @@ +################################ +# 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: FlamingLily + +# 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: "Added a latejoin/off-duty spawn point for the medbay's recovery ward, available only to off-duty crew and passengers." + - rscadd: "Vastly expanded the medbay recovery ward, adding more opportunities for extended RP focusing in the room." diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index a618f245e71..0d083dad741 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -152,8 +152,8 @@ evac_controller_type = /datum/evacuation_controller/starship - allowed_spawns = list("Living Quarters Lift", "Cryogenic Storage") - spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo) + allowed_spawns = list("Living Quarters Lift", "Cryogenic Storage", "Medbay Recovery Ward") + spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo, /datum/spawnpoint/medbay_recovery) default_spawn = "Living Quarters Lift" allow_borgs_to_leave = TRUE diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 92a83a549cb..9be8ad85002 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -11819,6 +11819,13 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) +"bEp" = ( +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "bEx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12182,18 +12189,30 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "bGX" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 1; - req_one_access = list(5,12) - }, -/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/machinery/door/blast/shutters{ + density = 0; + icon_state = "shutter0"; + id = "LCKDshutters"; + 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 + }, +/turf/simulated/floor/tiled/full, +/area/medical/ward) "bGY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12263,11 +12282,6 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/curtain/open/medical, -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/obj/item/folder, /turf/simulated/floor/tiled/white, /area/medical/ward) "bHs" = ( @@ -14168,15 +14182,14 @@ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/west, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/effect/landmark/latejoinmedbayrecovery, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "bTL" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, /turf/unsimulated/floor{ @@ -14824,10 +14837,15 @@ /turf/space/transit/east, /area/template_noop) "bYL" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "Recovery1" +/obj/item/folder, +/obj/structure/table/glass{ + table_reinf = "glass" }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/curtain/open/medical, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, /area/medical/ward) "bYM" = ( /obj/machinery/light/small/emergency{ @@ -17270,7 +17288,7 @@ }, /obj/structure/trash_pile, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "cqg" = ( /obj/machinery/airlock_sensor{ dir = 4; @@ -18970,6 +18988,20 @@ /obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) +"cEK" = ( +/obj/structure/table/glass{ + table_reinf = "glass" + }, +/obj/structure/curtain/open/medical, +/obj/item/folder, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "cEL" = ( /obj/machinery/door/airlock/glass_command{ dir = 1; @@ -19055,6 +19087,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/corner_wide/green/full, /turf/simulated/floor/tiled/white, /area/medical/ward) "cFC" = ( @@ -19963,9 +19996,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor, -/area/maintenance/bridge) +/turf/simulated/wall, +/area/horizon/maintenance/deck_three/aft/starboard) "cMy" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -30850,8 +30882,12 @@ /turf/simulated/open, /area/turbolift/primary/deck_3) "eqE" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 +/obj/structure/curtain/open/medical, +/obj/structure/bed/stool/padded/red{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -36937,6 +36973,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/closet/secure_closet/personal/patient, /turf/simulated/floor/tiled/white, /area/medical/ward) "fjA" = ( @@ -38740,8 +38777,14 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "fzi" = ( -/turf/simulated/floor/tiled/white, -/area/medical/ward) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "fzj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -40293,14 +40336,16 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/alarm/west{ - req_one_access = list(24,11,55) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/maintenance{ + dir = 1; + req_one_access = list(5,12) + }, +/obj/machinery/door/firedoor, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "fKD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -51515,20 +51560,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "hpL" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/bed/padded, +/obj/item/bedsheet/medical, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 }, -/obj/structure/platform/ledge{ - dir = 1 - }, -/obj/structure/platform/ledge{ - dir = 8 - }, -/obj/structure/platform_deco/ledge{ - dir = 6 - }, -/turf/simulated/open, -/area/hallway/medical/upper) +/turf/simulated/floor/tiled/white, +/area/medical/ward) "hpM" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -52832,15 +52870,14 @@ /turf/simulated/floor/tiled/dark, /area/supply/dock) "hyv" = ( -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 8 +/obj/item/device/radio/intercom/north{ + dir = 8; + pixel_y = 0; + pixel_x = -7 }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Examination Office 1" +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 }, -/obj/structure/bed/padded, -/obj/item/device/radio/intercom/north, -/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/medical/ward) "hyB" = ( @@ -53584,18 +53621,12 @@ /turf/simulated/floor/holofloor/tiled, /area/template_noop) "hFt" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/newscaster/east, -/obj/machinery/disposal/small/west{ - pixel_y = -5 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/ward) +/obj/structure/reagent_dispensers/extinguisher, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "hFx" = ( /obj/structure/closet/walllocker/medical/firstaid{ pixel_x = -32 @@ -59527,20 +59558,15 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "izA" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 4 - }, +/obj/machinery/light, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/table/glass{ - table_reinf = "glass" +/obj/effect/floor_decal/corner_wide/green{ + dir = 10 }, -/obj/item/modular_computer/laptop/preset/medical{ - pixel_y = 4 +/obj/structure/bed/stool/chair/office/dark{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -62493,11 +62519,6 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, -/obj/structure/curtain/open/medical, -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/obj/item/folder, /obj/machinery/firealarm/west, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -64167,13 +64188,12 @@ /turf/unsimulated/floor/dark, /area/antag/actor) "jhV" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/ward) "jib" = ( @@ -65138,20 +65158,10 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "joV" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 4; - req_one_access = list(5,12) +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "Medical Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, +/turf/simulated/floor/tiled/white, /area/medical/ward) "joW" = ( /obj/machinery/light/small{ @@ -79794,6 +79804,17 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) +"lvK" = ( +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/item/deck/kotahi{ + pixel_x = -2; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "lvM" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 1 @@ -83190,6 +83211,13 @@ }, /turf/simulated/wall, /area/maintenance/wing/port/far) +"lTQ" = ( +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/machinery/vending/lavatory, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "lTW" = ( /turf/simulated/floor/holofloor/desert{ name = "dirt" @@ -86382,6 +86410,16 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"mrR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/junk, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "mrU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -90744,7 +90782,7 @@ /obj/structure/table/rack, /obj/random/loot, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "naL" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -91264,17 +91302,16 @@ /turf/simulated/floor/tiled, /area/bridge) "nfj" = ( -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/light{ - dir = 4 +/obj/structure/bed/stool/padded/red{ + dir = 8 + }, +/obj/structure/curtain/open/medical, +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 }, -/obj/machinery/alarm/north, /turf/simulated/floor/tiled/white, /area/medical/ward) "nfr" = ( @@ -95016,13 +95053,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "nHc" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ +/obj/machinery/alarm/north{ dir = 4; - req_one_access = list(5,12) + pixel_y = 3; + pixel_x = 8 }, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/machinery/cryopod, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/computer/cryopod/living_quarters{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/medical/ward) "nHw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/firedoor, @@ -103415,8 +103457,10 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 8 }, -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/ward) "oUB" = ( @@ -103661,12 +103705,14 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/transport1) "oWN" = ( -/obj/machinery/light, -/obj/structure/platform/ledge{ - dir = 1 +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 }, -/turf/simulated/open, -/area/hallway/medical/upper) +/obj/structure/bed/stool/chair/plastic{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "oWT" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -106863,7 +106909,7 @@ dir = 8 }, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "pua" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -109179,6 +109225,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/random/loot, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "pLN" = ( @@ -113936,15 +113984,9 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) "qvR" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/ward) +/obj/machinery/light, +/turf/simulated/open, +/area/hallway/medical/upper) "qvT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -115190,11 +115232,9 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 8 }, -/obj/structure/curtain/open/medical, -/obj/structure/bed/stool/padded/red, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/stool/chair/plastic{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -118358,11 +118398,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "rac" = ( -/obj/structure/lattice, -/obj/structure/platform/ledge{ - dir = 1 +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "Recovery1" }, -/turf/simulated/open, +/turf/simulated/floor/tiled/dark/full, /area/hallway/medical/upper) "rad" = ( /obj/machinery/door/airlock/maintenance{ @@ -121908,6 +121947,18 @@ /obj/structure/bed, /turf/simulated/floor/reinforced, /area/rnd/isolation_c) +"rBk" = ( +/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/medical/ward) "rBp" = ( /obj/structure/table/steel, /obj/item/device/flashlight/lamp, @@ -122536,8 +122587,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/alarm/west{ + req_one_access = list(24,11,55) + }, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "rGu" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -125133,9 +125187,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/bed/stool/chair/office/light{ - dir = 4 - }, +/obj/structure/closet/secure_closet/personal/patient, /turf/simulated/floor/tiled/white, /area/medical/ward) "sck" = ( @@ -127058,12 +127110,18 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "sro" = ( -/obj/random/junk, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 }, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/structure/mirror{ + pixel_x = 27 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 13 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "srq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -143544,6 +143602,26 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) +"uKQ" = ( +/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/medical/ward) "uKS" = ( /obj/structure/table/standard, /obj/item/storage/box/gloves, @@ -146663,6 +146741,25 @@ /obj/machinery/alarm/south, /turf/simulated/floor/tiled/dark/full, /area/rnd/telesci) +"viE" = ( +/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) + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "viI" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 8 @@ -147177,8 +147274,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/structure/curtain/open/medical, -/obj/structure/bed/stool/padded/red, /turf/simulated/floor/tiled/white, /area/medical/ward) "vnb" = ( @@ -153185,7 +153280,7 @@ pixel_x = -32 }, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "whS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -155259,11 +155354,20 @@ /turf/simulated/open, /area/horizon/hallway/deck_three/primary/central) "wwd" = ( -/obj/structure/platform/ledge{ - dir = 1 +/obj/item/bedsheet/medical, +/obj/structure/bed/padded, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 8 }, -/turf/simulated/open, -/area/hallway/medical/upper) +/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/medical/ward) "wwg" = ( /obj/structure/flora/rock/pile, /obj/item/clothing/mask/skrell/skull, @@ -156463,7 +156567,7 @@ /obj/random/loot, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor, -/area/maintenance/bridge) +/area/horizon/maintenance/deck_three/aft/starboard) "wEv" = ( /obj/structure/railing/mapped{ dir = 1 @@ -160410,13 +160514,15 @@ /turf/simulated/wall/r_wall, /area/engineering/gravity_gen) "xfj" = ( -/obj/machinery/light/small/emergency, -/obj/structure/reagent_dispensers/extinguisher, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 4 + }, +/obj/machinery/vending/mredispenser, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "xfo" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/sink{ @@ -162103,11 +162209,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/maintenance/bridge) +/obj/effect/floor_decal/corner/green/diagonal{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/ward) "xrk" = ( /obj/machinery/light{ dir = 8 @@ -166846,8 +166954,21 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, -/obj/structure/bed/padded, -/obj/item/bedsheet/medical, +/obj/machinery/disposal/small/east, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/button/switch/windowtint{ + dir = 8; + id = "Recovery1"; + pixel_y = -2; + pixel_x = -22 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = -22; + pixel_y = 10 + }, /turf/simulated/floor/tiled/white, /area/medical/ward) "xZL" = ( @@ -167307,19 +167428,13 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod/pod4) "ydo" = ( +/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 = 6 - }, -/obj/random/pottedplant, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = 26 - }, -/obj/machinery/button/switch/windowtint{ - dir = 4; - id = "Recovery1"; - pixel_x = 26; - pixel_y = -8 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -326675,8 +326790,8 @@ fMK wIq aMt nnv -aMt -oWN +qvR +hxi cPk hZU cPk @@ -326933,8 +327048,8 @@ wIq aMt nnv aMt +rac wwd -cPk hyv iVv xZK @@ -327193,7 +327308,7 @@ nnv rac bYL eqE -qEB +joV oUA vna fjz @@ -327447,11 +327562,11 @@ wIq aMt nnv aMt -wwd -bYL +rac +hpL jhV -qvR tzA +qEB tzA scj gJl @@ -327704,12 +327819,12 @@ vww itI dOG itI -hpL -cPk +rac +cEK nfj -hFt -fzi -ydo +joV +lvK +joV izA gJl vGk @@ -327962,12 +328077,12 @@ hxi nOy hxi hxi -cPk -cPk -cPk +uKQ joV -cPk -cPk +joV +oWN +joV +viE cPk jZA jZA @@ -328209,14 +328324,14 @@ dBO dBO pcl pcl -dBO +hFt pLA amf sBy cVC rGn -rGn -rGn +fzi +mrR whN fKC bTK @@ -328224,7 +328339,7 @@ xrg xrg xrg xrg -xrg +ydo bGX xlN jHm @@ -328473,16 +328588,16 @@ cyL jQM wEs ptP -ptP +naK cqe cMw -hnU -naK -naK +nHc +rBk +lTQ sro -ptP +bEp xfj -hnU +cPk fIV pmk iCP @@ -328728,18 +328843,18 @@ jQM jQM jQM jQM -hnU -nHc -hnU -hnU -hnU -hnU -hnU -hnU -hnU -hnU -hnU -hnU +jQM +xPE +jQM +jQM +jQM +cPk +cPk +cPk +cPk +cPk +cPk +cPk eoG xcc nTz