diff --git a/html/changelogs/DreamySkrell-ops-lift-3515.yml b/html/changelogs/DreamySkrell-ops-lift-3515.yml new file mode 100644 index 00000000000..2f68af84428 --- /dev/null +++ b/html/changelogs/DreamySkrell-ops-lift-3515.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DreamySkrell + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Extends the operations lift to third deck, to a new auxiliary operations office." + - maptweak: "Top deck medbay is rearranged slightly to accomodate the new auxiliary operations office." diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index 5a72bef4f76..a3ae6b6f28b 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -99,8 +99,8 @@ map_shuttles = list( - /datum/shuttle/autodock/ferry/lift/scc_ship/cargo, /datum/shuttle/autodock/ferry/lift/scc_ship/morgue, + /datum/shuttle/autodock/multi/lift/operations, /datum/shuttle/autodock/multi/lift/robotics, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod1, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod2, diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 1fe6ba79770..0f0e6fde040 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -176,6 +176,11 @@ icon_state = "quartoffice" sound_env = MEDIUM_SOFTFLOOR +/area/operations/office_aux + name = "Operations Office (Aux)" + icon_state = "quartoffice" + sound_env = MEDIUM_SOFTFLOOR + /area/operations/mail_room name = "Operations Mail Room" icon_state = "red" diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm index 36f27f39bb3..3d8d5a27c5f 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -73,32 +73,6 @@ lift_floor_label = "Deck 2" lift_floor_name = "Main Deck" -//Cargo Lift -/datum/shuttle/autodock/ferry/lift/scc_ship/cargo - name = "Operations Lift" - location = 1 - shuttle_area = /area/turbolift/scc_ship/cargo_lift - waypoint_station = "nav_cargo_lift_bottom" - waypoint_offsite = "nav_cargo_lift_top" - -/obj/effect/shuttle_landmark/lift/cargo_top - name = "Operations Top" - landmark_tag = "nav_cargo_lift_top" - base_area = /area/operations/storage - base_turf = /turf/simulated/open - -/obj/effect/shuttle_landmark/lift/cargo_bottom - name = "Operations Bottom" - landmark_tag = "nav_cargo_lift_bottom" - flags = SLANDMARK_FLAG_AUTOSET - base_area = /area/operations/loading - base_turf = /turf/simulated/floor/plating - -/area/turbolift/scc_ship/cargo_lift - name = "Operations Lift" - sound_env = STANDARD_STATION - ambience = AMBIENCE_HANGAR - //Morgue Lift /datum/shuttle/autodock/ferry/lift/scc_ship/morgue name = "Morgue Lift" @@ -125,6 +99,50 @@ sound_env = TUNNEL_ENCLOSED ambience = AMBIENCE_GHOSTLY +//Operations Lift +/datum/shuttle/autodock/multi/lift/operations + name = "Operations Lift" + current_location = "nav_operations_lift_second_deck" + shuttle_area = /area/turbolift/scc_ship/operations_lift + destination_tags = list( + "nav_operations_lift_first_deck", + "nav_operations_lift_second_deck", + "nav_operations_lift_third_deck" + ) + +/obj/effect/shuttle_landmark/lift/operations_first_deck + name = "Operations Lift - First Deck" + landmark_tag = "nav_operations_lift_first_deck" + flags = SLANDMARK_FLAG_AUTOSET + base_area = /area/operations/loading + base_turf = /turf/simulated/floor/plating + +/obj/effect/shuttle_landmark/lift/operations_second_deck + name = "Operations Lift - Second Deck" + landmark_tag = "nav_operations_lift_second_deck" + landmark_flags = SLANDMARK_FLAG_AUTOSET + base_area = /area/operations/storage + base_turf = /turf/simulated/open + +/obj/effect/shuttle_landmark/lift/operations_third_deck + name = "Operations Lift - Third Deck" + landmark_tag = "nav_operations_lift_third_deck" + landmark_flags = SLANDMARK_FLAG_AUTOSET + base_area = /area/operations/office_aux + base_turf = /turf/simulated/open + +/obj/machinery/computer/shuttle_control/multi/lift/operations + shuttle_tag = "Operations Lift" + +/obj/machinery/computer/shuttle_control/multi/lift/wall/operations + shuttle_tag = "Operations Lift" + +/area/turbolift/scc_ship/operations_lift + name = "Operations Lift" + sound_env = TUNNEL_ENCLOSED + ambience = AMBIENCE_GHOSTLY + + //Robotics Lift /datum/shuttle/autodock/multi/lift/robotics name = "Robotics Lift 2" diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 075c18491a2..8f0fc7ad062 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -3054,6 +3054,10 @@ }, /turf/simulated/floor/plating, /area/turbolift/research/deck_1) +"clf" = ( +/obj/effect/shuttle_landmark/lift/operations_first_deck, +/turf/simulated/floor/plating, +/area/operations/loading) "clG" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -3287,6 +3291,29 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) +"crZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ + dir = 2; + pixel_x = -26; + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/operations/loading) "cty" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ @@ -5549,10 +5576,6 @@ /mob/living/simple_animal/chicken, /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/lower) -"dWC" = ( -/obj/effect/shuttle_landmark/lift/cargo_bottom, -/turf/simulated/floor/plating, -/area/operations/loading) "dWD" = ( /obj/machinery/camera/network/mining{ c_tag = "Mining - Suit Storage"; @@ -24771,6 +24794,11 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, +/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ + dir = 2; + pixel_x = -8; + pixel_y = 26 + }, /turf/simulated/floor/tiled, /area/operations/loading) "rpB" = ( @@ -25893,10 +25921,6 @@ name = "Deck 1 Warehouse - Operations Shuttle"; sortType = "Deck 1 Warehouse - Operations Shuttle" }, -/obj/machinery/computer/shuttle_control/lift/wall{ - pixel_y = 32; - shuttle_tag = "Operations Lift" - }, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -47854,7 +47878,7 @@ gvZ uzB uzB ulE -ehD +crZ qDJ wlh gvZ @@ -48054,8 +48078,8 @@ pqh qkh vqU gvZ +clf uzB -dWC hRn ehD qDJ diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 2cca2790079..e35f57608f0 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -1265,13 +1265,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/machinery/computer/shuttle_control/lift{ - pixel_x = 9; - pixel_y = 23; - shuttle_tag = "Operations Lift" +/obj/effect/shuttle_landmark/lift/operations_second_deck, +/obj/machinery/computer/shuttle_control/multi/lift/operations{ + pixel_x = 11; + pixel_y = 18 }, /turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/cargo_lift) +/area/turbolift/scc_ship/operations_lift) "aBr" = ( /obj/effect/floor_decal/corner/mauve{ dir = 5 @@ -15616,7 +15616,7 @@ dir = 9 }, /turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/cargo_lift) +/area/turbolift/scc_ship/operations_lift) "hzC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16320,13 +16320,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/machinery/computer/shuttle_control/lift{ - pixel_x = -7; - pixel_y = -2; - shuttle_tag = "Operations Lift" - }, /turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/cargo_lift) +/area/turbolift/scc_ship/operations_lift) "hQI" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -23196,12 +23191,11 @@ /turf/simulated/floor/tiled/full, /area/engineering/engine_airlock) "llp" = ( -/obj/effect/shuttle_landmark/lift/cargo_top, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/cargo_lift) +/area/turbolift/scc_ship/operations_lift) "llB" = ( /obj/machinery/light/small{ dir = 4 @@ -26231,15 +26225,15 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/machinery/computer/shuttle_control/lift/wall{ - dir = 8; - pixel_x = 32; - shuttle_tag = "Operations Lift" - }, /obj/machinery/camera/network/supply{ c_tag = "Operations - Upper Warehouse Port"; dir = 8 }, +/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ + dir = 8; + pixel_x = 26; + pixel_y = -8 + }, /turf/simulated/floor/tiled, /area/operations/office) "mKD" = ( @@ -50203,10 +50197,10 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, -/obj/machinery/computer/shuttle_control/lift/wall{ +/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ dir = 8; - pixel_x = 32; - shuttle_tag = "Operations Lift" + pixel_x = 26; + pixel_y = 8 }, /turf/simulated/floor/tiled, /area/operations/office) diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index e0836cfcdc6..508a88329f6 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -16,10 +16,13 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "aaF" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner_wide/green{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "abx" = ( @@ -108,10 +111,15 @@ /turf/simulated/floor/tiled/dark/full/airless, /area/bridge/controlroom) "acp" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "acq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -138,6 +146,20 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/central) +"adi" = ( +/obj/machinery/button/remote/airlock{ + id = "deck2_medicaltoilet"; + name = "Door Bolt Control"; + pixel_x = -24; + pixel_y = -22; + specialfunctions = 4 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, +/turf/simulated/floor/tiled/freezer, +/area/medical/washroom) "adv" = ( /obj/machinery/door/airlock{ id_tag = "sec_deck3_toilet"; @@ -250,6 +272,23 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"agd" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, medical equipment room" + }, +/turf/simulated/floor/plating, +/area/medical/equipment) "agn" = ( /obj/structure/closet/crate, /obj/random/junk, @@ -566,6 +605,18 @@ }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) +"asl" = ( +/obj/effect/floor_decal/corner_wide/green{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/small/north{ + pixel_y = -17 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "asO" = ( /turf/simulated/wall/r_wall, /area/bridge/controlroom) @@ -775,6 +826,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/vacantoffice) +"aCg" = ( +/obj/machinery/vending/zora, +/obj/effect/floor_decal/industrial/hatch/grey, +/obj/machinery/status_display{ + layer = 4; + pixel_x = -16; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "aCw" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -968,50 +1029,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "aLV" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/structure/table/glass{ + table_reinf = "glass" }, -/obj/item/storage/belt/medical/first_responder{ - pixel_y = 4 - }, -/obj/item/storage/belt/medical/first_responder{ - pixel_y = 4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = -4 - }, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/item/clothing/accessory/stethoscope, -/obj/structure/table/rack, +/obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "aMn" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/corner_wide/yellow{ @@ -1487,6 +1510,17 @@ "bbm" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/engineering_ladder) +"bbA" = ( +/obj/machinery/recharge_station, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "bbB" = ( /obj/machinery/door/airlock/command{ id_tag = "consular_office"; @@ -1579,11 +1613,6 @@ /obj/machinery/disposal/small/south, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"beL" = ( -/obj/machinery/vending/cola, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/horizon/hallway/deck_three/primary/starboard) "bfL" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc_space_ship, @@ -1668,11 +1697,15 @@ /turf/simulated/floor/tiled, /area/security/vacantoffice) "bkj" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/hologram/holopad, -/mob/living/simple_animal/cat/crusher, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "bko" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -1943,8 +1976,11 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "byu" = ( -/turf/simulated/wall/r_wall, -/area/medical/ward/isolation) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/medical/washroom) "bzq" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 5; @@ -2349,6 +2385,19 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) +"bWc" = ( +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 + }, +/obj/structure/table/rack, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/storage/belt/medical, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/accessory/stethoscope, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "bWh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2627,6 +2676,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) +"cin" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "ciK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -2927,6 +2993,36 @@ /obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor/marble/dark, /area/bridge/minibar) +"cBU" = ( +/obj/structure/table/glass{ + table_reinf = "glass" + }, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer RC"; + pixel_y = -32 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -25; + pixel_y = -33 + }, +/obj/machinery/button/switch/windowtint{ + id = "cmooffice"; + pixel_x = -18; + pixel_y = -33; + req_access = list(40); + dir = 1 + }, +/obj/item/folder/white, +/obj/item/stamp/cmo, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "cCp" = ( /turf/simulated/wall/r_wall, /area/horizon/longbow) @@ -3390,7 +3486,7 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - Hallway 3" }, -/obj/effect/floor_decal/corner_wide/paleblue{ +/obj/effect/floor_decal/corner_wide/green{ dir = 5 }, /turf/simulated/floor/tiled/white, @@ -3673,17 +3769,21 @@ /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/port) "dkT" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 6 +/obj/effect/floor_decal/industrial/outline/medical, +/obj/machinery/washing_machine, +/obj/machinery/power/apc/low{ + dir = 4; + name = "east bump"; + pixel_x = 24 }, -/obj/item/modular_computer/laptop/preset/medical/cmo{ - pixel_y = 5 +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/structure/table/glass{ - table_reinf = "glass" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "dkV" = ( /obj/structure/railing/mapped{ dir = 8 @@ -4484,21 +4584,14 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "dZt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Staff Showers"; - req_access = list(5) +/obj/structure/sink{ + dir = 4; + pixel_x = 12 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/mirror{ + pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/freezer, /area/medical/washroom) "dZG" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ @@ -4997,14 +5090,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "eny" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light, -/obj/machinery/firealarm/south, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) "enA" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/table/wood, @@ -5093,22 +5183,16 @@ /turf/simulated/floor/wood, /area/horizon/hallway/deck_three/primary/port) "erx" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/mirror{ - pixel_y = 32 +/obj/effect/floor_decal/corner/brown/full, +/obj/machinery/disposal/small/east{ + pixel_x = -16 }, -/obj/structure/sink{ - pixel_y = 28 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/button/remote/airlock{ - id = "deck2_medicaltoilet"; - name = "Door Bolt Control"; - pixel_x = -14; - pixel_y = 33; - specialfunctions = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "erV" = ( /turf/simulated/floor/tiled/ramp, /area/bridge/meeting_room) @@ -6157,6 +6241,21 @@ }, /turf/simulated/floor, /area/crew_quarters/captain) +"fhd" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/item/stack/material/steel/full{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "fho" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -6441,6 +6540,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/horizon/longbow) +"foR" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "cmowindowshutters"; + name = "Window Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "foT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -6584,6 +6694,15 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) +"ftA" = ( +/obj/machinery/shower{ + pixel_y = 24 + }, +/obj/random/soap, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/freezer, +/area/medical/washroom) "ftB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -6663,17 +6782,15 @@ /turf/simulated/floor/wood, /area/horizon/cafeteria) "fvl" = ( -/obj/effect/floor_decal/corner_wide/paleblue/full{ - dir = 8 +/obj/effect/floor_decal/corner_wide/green/diagonal{ + dir = 4 }, -/obj/structure/filingcabinet/medical{ - pixel_x = -7 - }, -/obj/structure/filingcabinet/chestdrawer{ - pixel_x = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "fvX" = ( /obj/machinery/light, /obj/machinery/status_display{ @@ -6731,19 +6848,20 @@ /turf/simulated/floor/tiled/full, /area/bridge) "fxk" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/machinery/door/window/northleft, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/medical/washroom) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/computer/shuttle_control/multi/lift/operations{ + pixel_x = -13; + pixel_y = 16 + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "fxm" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -6894,6 +7012,13 @@ }, /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) +"fCl" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "fDt" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -7004,22 +7129,18 @@ /turf/simulated/floor/tiled/dark/full, /area/maintenance/engineering_ladder) "fHD" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, medical equipment room" +/obj/structure/table/glass{ + table_reinf = "glass" }, -/turf/simulated/floor/plating, -/area/medical/equipment) +/obj/item/device/flashlight/lamp, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "fHK" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Deck 3 Civilian Subgrid"; @@ -7164,19 +7285,27 @@ /turf/simulated/floor/tiled/dark/full, /area/medical/ward/isolation) "fNH" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 6 + }, +/obj/machinery/disposal/small/west{ + pixel_x = 15 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23; + pixel_y = 23 + }, +/obj/machinery/button/switch/windowtint{ + id = "cmooffice"; + pixel_x = 23; + pixel_y = 30; + req_access = list(40); dir = 8 }, -/obj/machinery/power/apc/low{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "fNP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7193,27 +7322,14 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "fOh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 - }, -/obj/machinery/light/floor{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical/upper) +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard/docks) "fOk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -7279,21 +7395,7 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/interrogation/monitoring) "fSa" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/entry_point/aft{ - name = "aft, medical break room" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall, /area/medical/smoking) "fSb" = ( /obj/effect/floor_decal/corner/blue{ @@ -7353,6 +7455,28 @@ }, /turf/simulated/floor/wood, /area/lawoffice/representative) +"fTH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + name = "Staff Facilities"; + req_access = list(5) + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "fTY" = ( /obj/structure/bed/stool/chair/padded/brown{ dir = 4 @@ -7719,16 +7843,19 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "gjn" = ( -/obj/effect/floor_decal/corner_wide/paleblue/full, -/obj/machinery/photocopier, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = 11 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 22; + pixel_y = -22 }, -/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "gjo" = ( /obj/structure/grille, /obj/machinery/door/blast/regular{ @@ -7992,19 +8119,20 @@ /turf/simulated/floor/carpet, /area/lawoffice/representative) "gvG" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/medical/washroom) +/obj/machinery/light, +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) +"gvP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/random/loot, +/turf/simulated/floor, +/area/maintenance/security_starboard) "gxt" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -8096,6 +8224,22 @@ }, /turf/simulated/floor/reinforced/airless, /area/template_noop) +"gzJ" = ( +/obj/effect/floor_decal/corner_wide/paleblue/full, +/obj/structure/closet/secure_closet/CMO, +/obj/item/device/eftpos{ + eftpos_name = "Medbay EFTPOS scanner" + }, +/obj/item/device/megaphone, +/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2, +/obj/item/storage/box/gloves, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -21; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "gAQ" = ( /obj/effect/landmark/map_data{ height = 3 @@ -8223,12 +8367,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/requests_console{ - pixel_x = -30 - }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "gHu" = ( @@ -8588,10 +8733,9 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 10 }, -/obj/structure/disposalpipe/sortjunction/flipped{ +/obj/structure/disposalpipe/junction{ dir = 4; - name = "CMO Office"; - sortType = "CMO Office" + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) @@ -8669,20 +8813,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "gZR" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille/diagonal{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/equipment) +/turf/simulated/floor/reinforced, +/area/medical/smoking) "hai" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8770,17 +8914,38 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "hdq" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/obj/structure/railing/mapped{ dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - id_tag = "deck2_medicaltoilet"; - name = "Washroom Stall"; - req_access = list(5) +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/brown{ + dir = 5 }, -/turf/simulated/floor/tiled/full, -/area/medical/washroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/apc/low{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/sign/drop{ + desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'."; + name = "\improper DANGER: FALLING HAZARD sign"; + pixel_x = -48; + pixel_y = 32 + }, +/obj/item/folder/yellow{ + pixel_y = 2; + pixel_x = -2 + }, +/obj/item/pen/black{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "hed" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8822,76 +8987,18 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "heB" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/table/standard, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -14 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/device/flashlight/pen{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/taperoll/medical{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/taperoll/medical{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/taperoll/medical{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/cane, -/obj/item/cane, -/obj/item/cane, -/obj/item/cane, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "hfc" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/bed/stool/padded/red, @@ -9161,16 +9268,20 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/maintenance/deck_three/aft/starboard) "hmP" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 }, -/obj/structure/closet/secure_closet/medical3, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Secondary Storage" +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 10 + }, +/obj/structure/filingcabinet/medical{ + pixel_x = -7 + }, +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "hna" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -9310,6 +9421,23 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/crew_quarters/lounge) +"hse" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/entry_point/aft{ + name = "aft, medical equipment room" + }, +/turf/simulated/floor/plating, +/area/medical/equipment) "hsf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9525,19 +9653,14 @@ /turf/simulated/floor/wood, /area/horizon/cafeteria) "hzU" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/medical/equipment) +/obj/item/modular_computer/console/preset/medical/cmo{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "hAd" = ( /obj/structure/railing/mapped{ dir = 8 @@ -9589,14 +9712,13 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "hCi" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 10 +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "cargo_desk" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/operations/office_aux) "hCm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9728,15 +9850,13 @@ /turf/simulated/floor/wood, /area/bridge/minibar) "hLw" = ( -/obj/effect/floor_decal/corner_wide/paleblue/full{ - dir = 4 +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/table/standard, +/obj/structure/bedsheetbin{ + pixel_y = 5 }, -/obj/random/pottedplant, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "hLC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10265,6 +10385,11 @@ "ilL" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/storage/shields) +"imb" = ( +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "ime" = ( /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" @@ -10327,6 +10452,21 @@ }, /turf/simulated/open/airless, /area/template_noop) +"iqO" = ( +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 + }, +/obj/structure/table/glass{ + table_reinf = "glass" + }, +/obj/item/paper_bin{ + pixel_y = 3 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "irl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10505,19 +10645,10 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular) "iya" = ( -/obj/structure/closet/walllocker/medical{ - pixel_y = 32 - }, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/effect/floor_decal/industrial/outline/medical, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "iyM" = ( @@ -10813,6 +10944,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) +"iHj" = ( +/obj/effect/floor_decal/corner/green{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "iHq" = ( /obj/machinery/light{ dir = 1 @@ -10843,6 +10980,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/bridge) +"iIt" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + name = "Medical Equipment"; + req_access = list(66) + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/full, +/area/medical/equipment) "iJd" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -11038,6 +11198,15 @@ }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) +"iQi" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "deck2_medicaltoilet"; + name = "Washroom Stall"; + req_access = list(5) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "iQu" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11113,6 +11282,41 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet/art, /area/crew_quarters/lounge) +"iSt" = ( +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 + }, +/obj/machinery/button/remote/blast_door{ + id = "LCKDshutters"; + name = "MedBay Lockdown Control"; + pixel_x = -28; + pixel_y = -23; + req_access = list(40); + dir = 1 + }, +/obj/machinery/keycard_auth{ + pixel_y = -34; + pixel_x = -27 + }, +/obj/machinery/button/remote/blast_door{ + id = "cmowindowshutters"; + name = "Window Shutters"; + pixel_x = -7; + pixel_y = -24; + req_access = list(40); + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/button/remote/airlock{ + id = "CMOdoor"; + name = "Office Door Control"; + pixel_x = 11; + pixel_y = -24; + req_access = list(40); + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "iTU" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -11198,6 +11402,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) +"iVp" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/horizon/hallway/deck_three/primary/starboard) "iVD" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green{ @@ -11681,28 +11891,21 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "jvq" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, -/area/medical/equipment) -"jvs" = ( -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/obj/structure/sink/kitchen{ - name = "water fountain"; - pixel_y = 26 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/starboard) +/area/crew_quarters/heads/cmo) "jvA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11815,12 +12018,11 @@ /turf/simulated/floor/reinforced, /area/bridge/controlroom) "jxS" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled, +/area/medical/washroom) "jyf" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -12143,19 +12345,26 @@ /turf/simulated/floor/wood, /area/lawoffice/representative) "jKd" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/machinery/door/airlock/command{ + id_tag = "CMOdoor"; + name = "Chief Medical Officer's Office"; + req_access = list(40) }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Medical Equipment"; - req_access = list(66) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/medical/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/crew_quarters/heads/cmo) "jKp" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; @@ -12257,14 +12466,15 @@ /turf/simulated/floor/wood, /area/journalistoffice) "jOs" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/corner_wide/green/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "jOx" = ( /obj/effect/floor_decal/corner/beige{ dir = 5 @@ -12595,42 +12805,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) "kdj" = ( -/obj/effect/floor_decal/corner/green/diagonal{ +/obj/structure/bed/stool/chair/office/light{ dir = 8 }, -/obj/item/reagent_containers/hypospray{ - pixel_y = 4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = 4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = 4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = 4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = -4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = -4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = -4 - }, -/obj/item/reagent_containers/hypospray{ - pixel_y = -4 - }, -/obj/machinery/firealarm/south, -/obj/structure/table/rack, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23; - pixel_y = 10 +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 6 }, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "kfc" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12700,29 +12882,16 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "khe" = ( +/obj/structure/closet/walllocker/emerglocker/south, +/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "khp" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/starboard/docks) +/turf/simulated/wall/r_wall, +/area/crew_quarters/heads/cmo) "khy" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -13174,7 +13343,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner_wide/green{ +/obj/effect/floor_decal/corner_wide/paleblue{ dir = 9 }, /turf/simulated/floor/tiled/white, @@ -13217,20 +13386,15 @@ }, /area/bridge/meeting_room) "kwi" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 9 - }, -/obj/machinery/papershredder, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/effect/floor_decal/corner_wide/green/diagonal, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "kwj" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13264,6 +13428,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"kxi" = ( +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, medical washroom" + }, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/medical/washroom) "kxn" = ( /obj/machinery/telecomms/bus/preset_one, /turf/simulated/floor/bluegrid, @@ -13835,6 +14005,20 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) +"kXa" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "cmowindowshutters"; + name = "Window Shutters" + }, +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, CMO office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "kYv" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 6 @@ -13977,24 +14161,10 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "lbI" = ( -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/effect/floor_decal/corner_wide/paleblue/full{ - dir = 1 - }, -/obj/structure/closet/secure_closet/CMO, -/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2, -/obj/item/device/megaphone, -/obj/item/device/eftpos{ - eftpos_name = "Medbay EFTPOS scanner" - }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - CMO's Office" - }, -/obj/item/storage/box/gloves, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "lbL" = ( /turf/simulated/wall/r_wall, /area/bridge) @@ -14494,16 +14664,9 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "ltq" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "cmowindowshutters"; - name = "Window Shutters" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/effect/floor_decal/corner_wide/green/diagonal, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "ltv" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 10 @@ -14615,6 +14778,21 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"lwe" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/machinery/light/floor{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "lwt" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -14669,20 +14847,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) -"lyk" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/medical/smoking) "lyA" = ( /obj/item/stock_parts/subspace/treatment, /obj/item/stock_parts/subspace/treatment, @@ -15259,14 +15423,18 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "lXW" = ( -/obj/item/folder/white, -/obj/item/stamp/cmo, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/glass{ - table_reinf = "glass" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/washroom) "lYH" = ( /obj/machinery/power/breakerbox/activated, /obj/effect/floor_decal/industrial/warning/full, @@ -15414,11 +15582,24 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "mcf" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/structure/table/glass{ + table_reinf = "glass" + }, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/modular_computer/laptop/preset/medical/cmo{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "mcS" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -15512,8 +15693,34 @@ /turf/simulated/wall, /area/lawoffice/consular) "mgP" = ( -/turf/simulated/wall/r_wall, -/area/crew_quarters/heads/cmo) +/obj/structure/table/rack, +/obj/item/reagent_containers/hypospray{ + pixel_y = 4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = 4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = 4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = 4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = -4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = -4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = -4 + }, +/obj/item/reagent_containers/hypospray{ + pixel_y = -4 + }, +/obj/effect/floor_decal/corner_wide/green/full, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "mgS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16063,6 +16270,11 @@ }, /turf/simulated/floor/tiled/ramp, /area/horizon/security/meeting_room) +"mHG" = ( +/obj/machinery/vending/cola, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "mHV" = ( /turf/simulated/floor/carpet, /area/horizon/security/investigators_office) @@ -16160,6 +16372,15 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) +"mNj" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/medical/washroom) "mNG" = ( /obj/machinery/light{ dir = 4 @@ -16247,6 +16468,15 @@ }, /turf/simulated/floor/wood, /area/lawoffice/consular) +"mPi" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, +/obj/machinery/door/firedoor, +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, operations office aux" + }, +/turf/simulated/floor/plating, +/area/operations/office_aux) "mPm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16603,9 +16833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17021,6 +17248,43 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) +"nrw" = ( +/obj/item/storage/belt/medical/first_responder{ + pixel_y = 4 + }, +/obj/item/storage/belt/medical/first_responder{ + pixel_y = 4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = -4 + }, +/obj/structure/table/rack, +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "nrO" = ( /obj/structure/bed/stool/chair/office/bridge, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ @@ -17494,6 +17758,13 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/bridge) +"nLA" = ( +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 4 + }, +/obj/random/pottedplant, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "nLN" = ( /obj/structure/table/wood, /obj/structure/cable/green{ @@ -17712,6 +17983,36 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"nTv" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille/diagonal{ + dir = 8 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 + }, +/turf/simulated/floor/reinforced, +/area/medical/equipment) +"nUa" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "nUw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18161,16 +18462,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "olE" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "conferencewindowshutters"; - name = "Window Shutters" +/obj/effect/floor_decal/corner_wide/green{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "olJ" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/disposalpipe/segment{ @@ -18241,21 +18540,17 @@ /turf/simulated/floor/plating, /area/horizon/security/firing_range) "ooA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/structure/bed/stool/chair/office/dark, +/obj/machinery/button/remote/blast_door{ + id = "cargo_desk"; + pixel_x = 27; + pixel_y = -5 }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/cable/green, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/structure/closet/secure_closet/personal, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28; - req_one_access = list(24,11,55) +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled, +/area/operations/office_aux) "ooU" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -18270,16 +18565,23 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "opw" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/closet/secure_closet/personal, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = -7 +/obj/structure/closet/crate, +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/supply{ + c_tag = "Operations - Aux Desk"; + dir = 8 + }, +/obj/machinery/requests_console{ + department = "Operations Office (Aux)"; + departmentType = 2; + name = "Operations (Aux) Requests Console"; + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "opC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -18609,8 +18911,13 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "oBv" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/medical/ward/isolation) +/obj/structure/closet/secure_closet/medical3, +/obj/item/storage/box/gloves, +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "oCi" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -18637,6 +18944,53 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) +"oCU" = ( +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Secondary Storage" + }, +/obj/structure/table/standard, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/stethoscope{ + pixel_x = -4 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/device/gps/medical{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/device/gps/medical{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/device/gps/medical{ + pixel_x = 10; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "oDy" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -18732,15 +19086,15 @@ /turf/simulated/floor, /area/maintenance/bridge) "oIL" = ( -/obj/effect/floor_decal/corner/lime/diagonal, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled, +/area/operations/office_aux) "oIR" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/security/meeting_room) @@ -18968,12 +19322,6 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1380; @@ -18983,15 +19331,21 @@ pixel_y = -20; req_one_access = list(13) }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "oRM" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/recharge_station, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) "oSn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19050,9 +19404,6 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "oTU" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 - }, /turf/simulated/floor/tiled/white, /area/medical/ward) "oUm" = ( @@ -19091,17 +19442,16 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/autopsy_laboratory) "oUQ" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 1 }, -/obj/structure/closet/secure_closet/medical3, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = 24 +/obj/machinery/papershredder, +/obj/machinery/firealarm/north, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - CMO's Office" }, -/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "oVc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19121,6 +19471,9 @@ "oVU" = ( /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/alphadeck) +"oWf" = ( +/turf/simulated/wall/r_wall, +/area/operations/office_aux) "oWq" = ( /obj/machinery/door/airlock/external{ frequency = 1337; @@ -19192,13 +19545,23 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/maintenance/deck_three/aft/starboard) "oYR" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, +/obj/machinery/photocopier, +/obj/machinery/power/apc/low{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/closet/secure_closet/medical3, -/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "oZp" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -19211,14 +19574,10 @@ /turf/simulated/floor/grass/alt, /area/horizon/cafeteria) "oZE" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "oZS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19381,17 +19740,23 @@ /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "pke" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 +/obj/structure/table/standard, +/obj/item/storage/box/syringegun{ + pixel_y = 8 }, -/obj/machinery/photocopier/faxmachine{ - department = "Chief Medical Officer's Office" +/obj/item/gun/launcher/syringe, +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 }, -/obj/structure/table/glass{ - table_reinf = "glass" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "plh" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning{ @@ -19521,6 +19886,10 @@ /obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) +"prh" = ( +/obj/effect/shuttle_landmark/lift/operations_third_deck, +/turf/simulated/open, +/area/operations/office_aux) "psa" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -19662,17 +20031,8 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port/docks) "pBE" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical/upper) +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/operations/office_aux) "pBP" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -19744,6 +20104,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_three/primary/starboard/docks) +"pIS" = ( +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "pJW" = ( /obj/structure/closet, /obj/random/junk, @@ -19853,9 +20219,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/holodeck_control/beta) "pOM" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ +/obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "pPR" = ( @@ -20059,7 +20428,10 @@ req_access = list(5) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, /area/medical/smoking) "pZQ" = ( /obj/machinery/door/blast/regular{ @@ -20835,22 +21207,18 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/central) "qGg" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/machinery/door/airlock/mining{ + req_one_access = list(26,29,31,48,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, medical washroom" - }, -/turf/simulated/floor/plating, -/area/medical/washroom) +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) "qGX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -21108,11 +21476,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) "qSM" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/obj/effect/floor_decal/corner_wide/green{ +/obj/effect/floor_decal/corner_wide/paleblue{ dir = 9 }, /turf/simulated/floor/tiled/white, @@ -21192,14 +21556,11 @@ /turf/simulated/floor/lino/grey, /area/horizon/security/investigators_office) "qUP" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/mob/living/simple_animal/cat/crusher, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "qVa" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21345,6 +21706,9 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) +"rdI" = ( +/turf/simulated/wall, +/area/horizon/hallway/deck_three/primary/starboard/docks) "rem" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -21397,14 +21761,8 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "rhm" = ( -/obj/structure/curtain/open/shower, -/obj/machinery/door/window/westright, -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/random/soap, -/turf/simulated/floor/tiled/freezer, -/area/medical/washroom) +/turf/simulated/wall, +/area/operations/office_aux) "rhT" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -21736,14 +22094,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) @@ -21776,7 +22134,7 @@ /obj/structure/grille, /obj/machinery/door/blast/shutters{ density = 0; - dir = 8; + dir = 2; icon_state = "shutter0"; id = "LCKDshutters"; name = "MedBay Lockdown Shutters"; @@ -21815,20 +22173,13 @@ /turf/simulated/floor/tiled/full, /area/hallway/medical/upper) "rwO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/closet/secure_closet/medical3, +/obj/item/storage/box/gloves, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/command{ - id_tag = "CMOdoor"; - name = "Chief Medical Officer's Office"; - req_access = list(40) - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "rwV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22149,6 +22500,21 @@ dir = 4 }, /area/bridge) +"rJh" = ( +/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/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "rKd" = ( /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -22417,18 +22783,19 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "rTk" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 22 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled, +/area/operations/office_aux) "rTt" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -22441,15 +22808,15 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "rUd" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "rUs" = ( /obj/structure/railing/mapped{ dir = 1 @@ -22507,6 +22874,11 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -35; + pixel_y = 0 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "rXr" = ( @@ -23063,10 +23435,23 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "snv" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/machinery/door/window/northright, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "soE" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/captain) @@ -23245,15 +23630,13 @@ /turf/simulated/floor/tiled/dark/full, /area/tcommsat/entrance) "stP" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 - }, -/obj/item/modular_computer/console/preset/medical/cmo, -/obj/machinery/newscaster{ - pixel_y = 30 +/obj/structure/sink/kitchen{ + name = "water fountain"; + pixel_y = 26 }, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/washroom) "stS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23305,11 +23688,8 @@ /turf/simulated/floor/wood, /area/horizon/cafeteria) "svx" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/industrial/outline/medical, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/open, +/area/operations/office_aux) "svL" = ( /obj/structure/railing/mapped{ dir = 1 @@ -23739,6 +24119,19 @@ }, /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_three/aft/starboard) +"sPe" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard/docks) "sPi" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 4 @@ -23759,16 +24152,44 @@ /turf/simulated/floor/tiled/dark/full, /area/hallway/medical/upper) "sQE" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "cmowindowshutters"; - name = "Window Shutters" +/obj/structure/table/standard, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = -14 + }, +/obj/item/cane, +/obj/item/cane, +/obj/item/cane, +/obj/item/cane, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 1 + }, +/obj/item/defibrillator/loaded{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "sQP" = ( /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -24023,14 +24444,19 @@ /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/port/docks) "tfg" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/machinery/power/apc/low{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "tfi" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -24426,9 +24852,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -24436,6 +24859,9 @@ dir = 1; pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "tvl" = ( @@ -24861,17 +25287,51 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "tKk" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille/diagonal{ - dir = 8 +/obj/structure/table/standard, +/obj/item/taperoll/medical{ + pixel_x = 4; + pixel_y = 4 }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "cmowindowshutters"; - name = "Window Shutters" +/obj/item/taperoll/medical{ + pixel_x = 4; + pixel_y = 4 }, -/turf/simulated/floor/reinforced, -/area/crew_quarters/heads/cmo) +/obj/item/taperoll/medical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/device/flashlight/pen{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "tKU" = ( /obj/effect/floor_decal/spline/fancy{ dir = 8 @@ -24965,33 +25425,9 @@ /turf/simulated/floor/tiled/dark/full, /area/bridge/aibunker) "tNW" = ( -/obj/structure/bed/stool/chair/office/light, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/button/remote/airlock{ - id = "CMOdoor"; - name = "Office Door Control"; - pixel_x = -16; - pixel_y = -25; - req_access = list(40) - }, -/obj/machinery/button/remote/blast_door{ - id = "cmowindowshutters"; - name = "Window Shutters"; - pixel_x = -16; - pixel_y = -35; - req_access = list(40) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/switch/windowtint{ - id = "cmooffice"; - pixel_x = 10; - pixel_y = -26; - req_access = list(40) - }, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/washroom) "tNY" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -25171,7 +25607,6 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "tVW" = ( -/obj/effect/floor_decal/corner_wide/green/full, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25585,6 +26020,13 @@ }, /turf/simulated/open, /area/hallway/medical/upper) +"unw" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard/docks) "uoc" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -25612,16 +26054,10 @@ /turf/simulated/floor/wood, /area/lawoffice/consular) "uoU" = ( -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -21; - pixel_y = -10 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical/upper) +/obj/machinery/vending/snack, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "upf" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -25741,16 +26177,13 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "uwy" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/paper_bin{ - pixel_y = 6 +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/closet/secure_closet/personal, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/item/pen, -/obj/structure/table/glass{ - table_reinf = "glass" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "uwD" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 10 @@ -26328,22 +26761,17 @@ /turf/simulated/open, /area/maintenance/security_starboard) "uQk" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Staff Smoking Lounge"; - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/medical/smoking) @@ -26368,20 +26796,13 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "uRa" = ( -/obj/effect/floor_decal/corner_wide/paleblue, -/obj/effect/floor_decal/corner/paleblue{ - dir = 1 +/obj/machinery/iv_drip, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "uRs" = ( /obj/structure/railing/mapped{ dir = 1 @@ -26851,22 +27272,12 @@ /turf/simulated/floor/tiled, /area/bridge) "vjU" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 }, -/obj/structure/table/rack, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/accessory/stethoscope, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled, +/area/medical/washroom) "vka" = ( /obj/effect/floor_decal/corner_wide/yellow/full{ dir = 1 @@ -26903,9 +27314,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "vlC" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled/full, +/turf/simulated/wall, /area/horizon/hallway/deck_three/primary/starboard) "vlW" = ( /obj/structure/cable/green{ @@ -26919,9 +27328,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -26980,6 +27386,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark/full, /area/bridge/selfdestruct) +"vnW" = ( +/obj/structure/table/reinforced, +/obj/machinery/ringer_button{ + id = "cargo_ringer"; + pixel_x = 6; + pixel_y = 5 + }, +/obj/machinery/door/window/southright{ + name = "Operations Desk Exterior Access" + }, +/obj/machinery/door/window/northright{ + name = "Operations Desk Interior Access"; + req_access = list(50) + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "cargo_desk" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/operations/office_aux) "vob" = ( /obj/machinery/firealarm/south, /obj/random/pottedplant, @@ -27271,26 +27698,29 @@ }, /turf/simulated/floor/reinforced/airless, /area/template_noop) +"vCB" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "vCW" = ( /obj/effect/floor_decal/sign/cmo, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/paleblue{ +/obj/effect/floor_decal/corner_wide/green{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) @@ -27382,6 +27812,32 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/security/washroom) +"vIe" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Staff Smoking Lounge"; + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/small/north{ + pixel_y = -17 + }, +/turf/simulated/floor/tiled/dark, +/area/medical/smoking) "vIv" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/heads/hop/xo) @@ -27429,14 +27885,19 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "vKa" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 10 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -22; + pixel_y = -22 }, -/obj/structure/bed/stool/chair/office/light{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/washroom) "vKM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -27452,25 +27913,23 @@ }, /turf/simulated/floor/tiled, /area/security/vacantoffice) +"vLb" = ( +/obj/machinery/disposal/small/east{ + pixel_x = -16 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "vLH" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 +/obj/structure/bed/stool/chair/office/light{ + dir = 4 }, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/item/storage/box/syringegun{ - pixel_y = 8 - }, -/obj/item/gun/launcher/syringe, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/defibrillator/loaded, +/obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "vLY" = ( /turf/simulated/wall, /area/medical/washroom) @@ -27503,19 +27962,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "vMH" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "MedBay Lockdown Shutters"; - opacity = 0 +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/medical/equipment) +/obj/structure/table/glass{ + table_reinf = "glass" + }, +/obj/machinery/photocopier/faxmachine{ + department = "Chief Medical Officer's Office" + }, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "vMN" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -27618,6 +28078,11 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -35; + pixel_y = 0 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "vQq" = ( @@ -27784,6 +28249,13 @@ }, /turf/simulated/floor/tiled/full, /area/medical/ward/isolation) +"vWQ" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/item/storage/box/gloves, +/obj/effect/floor_decal/corner_wide/green/full, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/medical/equipment) "vWS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27817,14 +28289,28 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "vXo" = ( -/obj/structure/toilet{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/freezer, -/area/medical/washroom) +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "CMO Office"; + sortType = "CMO Office" + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "vXw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -27992,20 +28478,15 @@ /turf/simulated/open/airless, /area/horizon/exterior) "wfV" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner_wide/paleblue{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floor{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "wgc" = ( /obj/structure/railing/mapped{ dir = 8 @@ -28244,12 +28725,9 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "wpe" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, -/area/medical/equipment) +/area/crew_quarters/heads/cmo) "wpA" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/junk, @@ -28338,12 +28816,11 @@ /turf/simulated/floor/tiled/dark/full, /area/bridge/aibunker) "wtd" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "wtq" = ( @@ -28532,15 +29009,16 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "wAB" = ( @@ -28556,6 +29034,17 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/bridge) +"wCk" = ( +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "wCw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -28961,15 +29450,16 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "wRH" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/item/device/flashlight/lamp, -/obj/structure/table/glass{ - table_reinf = "glass" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor/tiled, +/area/operations/office_aux) "wSn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -29186,14 +29676,15 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "wWA" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/iv_drip, +/obj/effect/floor_decal/corner_wide/green{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/area/medical/equipment) "wWG" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 8 @@ -29274,6 +29765,20 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) +"wZU" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "LCKDshutters"; + name = "MedBay Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/medical/equipment) "xaL" = ( /obj/structure/bed/stool/chair/padded/brown{ dir = 4 @@ -29586,8 +30091,19 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "xon" = ( -/obj/machinery/vending/coffee, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "xoR" = ( @@ -29719,13 +30235,13 @@ /turf/simulated/floor/tiled/full, /area/maintenance/security_starboard) "xsy" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "xsC" = ( @@ -29770,6 +30286,18 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"xuH" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 + }, +/obj/machinery/requests_console{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "xvw" = ( /obj/structure/bed/stool/chair/padded/brown{ dir = 8 @@ -29848,25 +30376,23 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "xAc" = ( -/obj/machinery/vending/zora, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "xAy" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -30088,6 +30614,12 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"xKm" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/operations/office_aux) "xLf" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 @@ -30145,33 +30677,14 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "xOy" = ( -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 6 +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/closet/secure_closet/personal, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/keycard_auth{ - pixel_x = 24; - pixel_y = 24 - }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = 21; - pixel_y = -13 - }, -/obj/machinery/disposal/small/west{ - pixel_y = -5 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - id = "LCKDshutters"; - name = "MedBay Lockdown Control"; - pixel_x = 24; - pixel_y = 11; - req_access = list(40) - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) +/obj/machinery/firealarm/east, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "xPj" = ( /obj/machinery/vending/boozeomat{ req_access = null @@ -30210,22 +30723,16 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Starboard Dock Starboard"; + dir = 1 + }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Starboard Dock Starboard"; - dir = 1 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "xPz" = ( @@ -30517,18 +31024,20 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "yjY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) @@ -40359,9 +40868,9 @@ wGH wGH wGH wGH -wGH -wGH -wGH +ebZ +dce +dce kuk bCg ojm @@ -40561,11 +41070,11 @@ wGH wGH wGH wGH -wGH -wGH -wGH -ebZ -khp +gxt +shm +iPk +jIO +smM khe ebZ wGH @@ -40763,11 +41272,11 @@ wGH wGH wGH wGH -wGH -wGH -wGH -dce -xgv +spn +baz +jkC +czd +pTP xPy ebZ wGH @@ -40969,8 +41478,8 @@ ebZ dce dce ebZ -iHq -sEe +sPe +fOh ebZ dce dce @@ -41167,11 +41676,11 @@ wGH wGH wGH wGH -gxt -shm -iPk -jIO -smM +wGH +wGH +wGH +dce +pTP oRv wev iPk @@ -41369,11 +41878,11 @@ wGH wGH wGH wGH -spn -baz -jkC -czd -pTP +wGH +wGH +wGH +dce +unw xyA pIp aOx @@ -41571,11 +42080,11 @@ wGH wGH wGH wGH -ebZ +wGH +wGH +wGH dce -dce -ebZ -pTP +xgv tuN ebZ dce @@ -41975,7 +42484,7 @@ wGH wGH wGH wGH -wGH +iUA wGH wGH ebZ @@ -42581,7 +43090,7 @@ wGH wGH wGH wGH -wGH +dHX wGH wGH dce @@ -42776,14 +43285,14 @@ wGH wGH wGH wGH +iUA wGH wGH wGH wGH wGH -wGH -wGH -wGH +otI +tJH wGH wGH dce @@ -42967,6 +43476,7 @@ wGH wGH wGH wGH +iUA wGH wGH wGH @@ -42978,17 +43488,16 @@ wGH wGH wGH wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -dce +pBE +pBE +xKm +mPi +pBE +pBE +kvM +iVp +kvM +ebZ cii sgv rdE @@ -43170,27 +43679,27 @@ wGH wGH wGH wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -ebZ +gZR +pnL +rvF +pnL +rnX +rnX +foR +foR +kXa +foR +rnX +pBE +bbA +bkj +wRH +erx +rhm +uoU +vLb +mHG +rdI sNZ ePA htW @@ -43367,32 +43876,32 @@ wGH wGH wGH wGH +iUA wGH wGH wGH wGH -wGH -lTQ -lyk -rvF -lyk -xGf -vMH +pnL +ssB +foT +vob +khp vMH +iqO fHD +bWc hzU -hzU -cEy -cEy -cEy -qGg +gzJ +oWf +svx +svx fxk gvG -cEy -kvM -kvM -kvM -kvM +rhm +aCg +vCB +imb +vlC tjt trI iEg @@ -43570,30 +44079,30 @@ wGH wGH wGH wGH -wGH -wGH -wGH -wGH -pnL -ssB -foT -vob -ewp +nTv +wZU +agd +xGf +lTQ +uWn +dWt +eUj +khp oYR -mcf +fCl rUd heB vLH -vLY -vXo -vLY +iSt +oWf +prh svx snv oRM -vLY +qGg xAc xon -beL +mqJ vlC wUS irl @@ -43772,30 +44281,30 @@ wGH wGH wGH wGH -wGH -wGH -wGH -wGH -pnL -uWn -dWt -eUj -ewp +wZU +rwO +oBv +vWQ +fSa +wGi +rpL +vIe +khp hmP wpe qUP mcf aLV -vLY -erx +cBU +oWf hdq acp oIL eny -vLY -jvs -gqw -gqw +hCi +iya +rJh +iHj gqw rWG irl @@ -43974,27 +44483,27 @@ wGH wGH wGH wGH -iUA -wGH -wGH -wGH +hse +pIS +ltq +asl +fSa +fSa fSa -wGi -rpL uQk -ewp +khp oUQ fNH wfV jvq kdj -vLY -rhm -vLY +nLA +oWf +fhd opw rTk ooA -vLY +vnW iya yjY tJS @@ -44176,27 +44685,27 @@ wGH wGH wGH wGH -wGH +xGf tKk ltq olE -rnX -mgP +nrw mgP +ewp pZy -ewp -ewp -ewp -gZR +khp +khp +rOF +rOF jKd -ewp -vLY -vLY -vLY -vLY -dZt -vLY -vLY +rOF +rOF +oWf +rhm +rhm +rhm +rhm +rhm biw lki eZr @@ -44378,25 +44887,25 @@ oXs oXs wGH wGH -wGH -sQE +xGf +oCU fvl jOs kwi gjn -mgP +iIt rva vQi -mhE +wCk kvB -pBE -iBF -uoU +qSM +nUa +qSM qSM gHo rXj -kvB -pBE +xuH +mhE lsZ ajj jWd @@ -44578,23 +45087,23 @@ wGH oXs mWi oXs -wGH -wGH -wGH +kxi +cEy +xGf sQE pke wWA tfg uRa -rwO +ewp vCW ohk qmY +lwe qmY -fOh -qmY -qmY +vXo qmY +rRE vvg joR rRE @@ -44780,15 +45289,15 @@ kVK oXs onG oXs -wGH -wGH -wGH -sQE -wRH -jxS -bkj -hCi -rOF +ftA +mNj +xGf +ewp +ewp +ewp +ewp +ewp +ewp xsy gUY sMd @@ -44981,18 +45490,18 @@ pAw aCw eZu aIC -oXs -wGH -wGH -wGH -rnX +pAw +byu +dZt +adi +iQi vjU jxS uwy oZE -rOF +vLY pOM -iiQ +jRh umT dVW nHR @@ -45183,18 +45692,18 @@ pAw bEk eZu fWM -oXs -oXs -oBv -oBv -rnX +pAw +pAw +wld +wld +vLY stP tNW lXW vKa -rOF +fTH wtd -jRh +cin gPn nHR nHR @@ -45387,14 +45896,14 @@ myt fWM eVm oeD -byu +wld cQU -mgP +vLY lbI xOy dkT hLw -rOF +vLY aaF nXf umT @@ -45589,14 +46098,14 @@ lzQ fWM gIr oeD -byu +wld vVZ -mgP -mgP -mgP -mgP -mgP -mgP +vLY +vLY +vLY +vLY +vLY +vLY daa iiQ umT @@ -45791,15 +46300,15 @@ pAw eJa pAw pAw -byu +wld kEe -byu +wld okz wld vjh xFO uTn -pOM +iYu iiQ umT dVW