diff --git a/html/changelogs/DreamySkrell-verticality234635ygtrefsg.yml b/html/changelogs/DreamySkrell-verticality234635ygtrefsg.yml new file mode 100644 index 00000000000..ba279281a10 --- /dev/null +++ b/html/changelogs/DreamySkrell-verticality234635ygtrefsg.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: "Third deck starboard hallway remap, adding a bit of verticality between it and the ops lobby hallway." + diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index f14bbb46b35..8c4e87b6a09 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -685,6 +685,12 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "azF" = ( @@ -1508,7 +1514,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "bbV" = ( -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "bdi" = ( /obj/structure/sink{ @@ -1573,15 +1582,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "beL" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/bed/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/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, @@ -1638,14 +1642,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) "biw" = ( -/obj/machinery/vending/zora, -/obj/machinery/status_display{ - layer = 4; +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/structure/closet/walllocker/firecloset{ pixel_y = 32 }, -/obj/effect/floor_decal/corner/green/full{ - dir = 8 - }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "biY" = ( @@ -2330,20 +2333,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "bWU" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/effect/floor_decal/corner/green/full{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Starboard Lounge Port Entrance"; + dir = 8 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) @@ -2423,20 +2418,19 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "ccQ" = ( -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "deck2_medicaltoilet"; - name = "Door Bolt Control"; - pixel_x = 24; - specialfunctions = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/hallway/deck_three/primary/starboard) "cdh" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -2971,13 +2965,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "cHl" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "cHQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -4018,15 +4012,17 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "dGU" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/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/green{ dir = 8 }, -/obj/structure/table/rack, -/obj/item/towel, -/obj/random/soap, -/turf/simulated/floor/tiled/freezer, -/area/medical/washroom) +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "dHr" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -4372,16 +4368,22 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "dZt" = ( -/obj/structure/closet/emcloset, -/obj/structure/railing/mapped{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Staff Showers"; + req_access = list(5) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/green/full{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, +/area/medical/washroom) "dZG" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "Recovery1" @@ -4813,12 +4815,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/central) "eny" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/light, +/obj/machinery/firealarm/south, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/washroom) @@ -4838,8 +4839,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "enM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/green{ - dir = 8 + dir = 9 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) @@ -4911,8 +4918,19 @@ /area/horizon/hallway/deck_three/primary/port) "erx" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light{ - dir = 1 +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 28 + }, +/obj/machinery/button/remote/airlock{ + dir = 2; + id = "deck2_medicaltoilet"; + name = "Door Bolt Control"; + pixel_x = -14; + specialfunctions = 4; + pixel_y = 33 }, /turf/simulated/floor/tiled/white, /area/medical/washroom) @@ -5466,15 +5484,9 @@ /turf/simulated/floor/carpet, /area/lawoffice/representative) "ePx" = ( -/obj/structure/table/standard, -/obj/item/material/ashtray/glass, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "ePA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7139,13 +7151,23 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "fUZ" = ( -/obj/structure/railing/mapped{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "fVv" = ( /obj/structure/railing/mapped{ @@ -7582,24 +7604,11 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "gqw" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 - }, -/obj/structure/mirror{ - pixel_x = 26; - pixel_y = 3 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "gqH" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -8381,7 +8390,7 @@ /obj/machinery/door/airlock/glass{ name = "Deck 3 Starboard Hallway" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "gYl" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -8524,8 +8533,16 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "hdq" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + id_tag = "deck2_medicaltoilet"; + name = "Washroom Stall"; + req_access = list(5) + }, +/turf/simulated/floor/tiled/full, /area/medical/washroom) "hed" = ( /obj/structure/cable/green{ @@ -9278,7 +9295,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "hzS" = ( /obj/structure/railing/mapped, @@ -9312,6 +9329,19 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "hAW" = ( @@ -10104,7 +10134,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "isu" = ( /obj/structure/table/rack, @@ -10271,11 +10301,24 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular) "iya" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical/upper) +/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{ + dir = 5 + }, +/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, +/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "iyM" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 8 @@ -10293,9 +10336,21 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "iyP" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "iyX" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -10435,7 +10490,7 @@ /obj/machinery/door/airlock/glass{ name = "Deck 3 Starboard Docks" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard/docks) "iEk" = ( /obj/effect/floor_decal/corner/blue/full{ @@ -11293,15 +11348,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "jns" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/grass/alt, +/obj/structure/bed/stool/chair, +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jnZ" = ( /obj/structure/filingcabinet/chestdrawer{ @@ -11411,19 +11460,19 @@ /turf/simulated/floor/tiled/white, /area/medical/equipment) "jvs" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ +/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/machinery/door/airlock/medical{ - id_tag = "deck2_medicaltoilet"; - name = "Washroom Stall"; - req_access = list(5) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/full, -/area/medical/washroom) +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "jvA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11808,14 +11857,17 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_three/primary/starboard/docks) "jIW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/effect/floor_decal/corner/green{ - dir = 5 + dir = 9 }, -/obj/structure/sink/kitchen{ - name = "water fountain"; - pixel_y = 26 - }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jJh" = ( @@ -12167,6 +12219,7 @@ /obj/structure/sign/staff_only{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jWi" = ( @@ -12886,6 +12939,9 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"kvM" = ( +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/horizon/hallway/deck_three/primary/starboard) "kvP" = ( /obj/structure/closet/toolcloset, /obj/item/wrench, @@ -13346,11 +13402,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "kRs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/newscaster{ + pixel_x = 32; + pixel_y = -32 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/security/vacantoffice) +/area/horizon/hallway/deck_three/primary/starboard) "kSF" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -13495,6 +13555,21 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_three/aft/starboard) +"kWB" = ( +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/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 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "kYv" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 6 @@ -13877,19 +13952,18 @@ /area/crew_quarters/captain) "lki" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "lkl" = ( /obj/machinery/door/airlock/maintenance{ @@ -14010,10 +14084,10 @@ /turf/simulated/wall, /area/horizon/security/meeting_room) "lnX" = ( -/obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, +/obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "lou" = ( @@ -14119,21 +14193,9 @@ /turf/simulated/floor/tiled/dark/full, /area/tcommsat/chamber) "lsZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/vacantoffice) +/obj/effect/floor_decal/corner_wide/green/full, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "lta" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -14476,15 +14538,29 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Starboard Lounge Entrance"; - dir = 1 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "lEE" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "lEP" = ( /obj/structure/lattice, @@ -14920,7 +14996,19 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "maM" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/security/vacantoffice) "maP" = ( @@ -15237,16 +15325,15 @@ /area/horizon/exterior) "mjH" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) @@ -15608,17 +15695,17 @@ /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "mCp" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/effect/floor_decal/spline/plain/corner, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "mCX" = ( /obj/effect/floor_decal/corner_wide/yellow/diagonal, @@ -16218,12 +16305,22 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) "ney" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "nez" = ( @@ -16444,11 +16541,16 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "nmD" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/palebush, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "nmW" = ( @@ -16645,14 +16747,16 @@ /turf/simulated/floor, /area/maintenance/bridge) "nvd" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/structure/lattice, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/station_map{ - dir = 1; - pixel_y = -32 +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Starboard Lounge Entrance"; + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "nvi" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -17019,15 +17123,10 @@ /turf/simulated/floor/lino/grey, /area/horizon/security/investigators_office) "nIW" = ( -/obj/structure/bed/stool/chair{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, +/obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "nJT" = ( @@ -17437,11 +17536,14 @@ /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "oaY" = ( -/obj/machinery/vending/snack, -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "obj" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -17805,21 +17907,20 @@ /turf/simulated/floor/plating, /area/horizon/security/firing_range) "ooA" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 }, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light, +/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); + pixel_y = 0 + }, /turf/simulated/floor/tiled/white, /area/medical/washroom) "ooU" = ( @@ -17836,14 +17937,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "opw" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28; - req_one_access = list(24,11,55) - }, /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 + }, /turf/simulated/floor/tiled/white, /area/medical/washroom) "opC" = ( @@ -17905,13 +18006,21 @@ /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/central) "otj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Starboard Lounge Port Entrance"; - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "otx" = ( @@ -17993,22 +18102,15 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "ouY" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/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/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/green{ - dir = 5 + dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "ovx" = ( @@ -18297,9 +18399,13 @@ /turf/simulated/floor, /area/maintenance/bridge) "oIL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/medical/washroom) "oIR" = ( @@ -18432,14 +18538,21 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "oMC" = ( -/obj/structure/bed/stool/chair, -/obj/structure/railing/mapped{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "oNi" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -19247,7 +19360,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "pFY" = ( /obj/structure/cable/green{ @@ -20064,15 +20177,6 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/central) "qrw" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) @@ -20134,13 +20238,12 @@ /turf/simulated/floor/reinforced, /area/bridge/minibar) "qub" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/lattice, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "qut" = ( /obj/machinery/light{ @@ -20201,12 +20304,8 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "qxO" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/bed/stool/chair, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "qyl" = ( @@ -20721,15 +20820,12 @@ /area/medical/equipment) "qVa" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/green/full{ dir = 4 }, /turf/simulated/floor/tiled, @@ -20916,6 +21012,7 @@ /obj/machinery/shower{ pixel_y = 24 }, +/obj/random/soap, /turf/simulated/floor/tiled/freezer, /area/medical/washroom) "rhT" = ( @@ -21914,18 +22011,16 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "rTk" = ( -/obj/structure/mirror{ - pixel_x = 28; - pixel_y = 6 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23; - pixel_y = -9 - }, -/obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/industrial/outline/medical, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/white, /area/medical/washroom) "rTt" = ( @@ -22545,14 +22640,10 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "snv" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled/white, +/area/medical/washroom) "soE" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/captain) @@ -23347,9 +23438,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "sWB" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass/alt, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "sWI" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -23596,6 +23689,13 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/longbow) +"tjt" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "tjC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23822,7 +23922,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard/docks) "tse" = ( /obj/machinery/door/airlock/command{ @@ -24156,21 +24256,12 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) "tGz" = ( -/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/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction/yjunction{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "tGG" = ( @@ -24291,15 +24382,15 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "tJS" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/table/rack, -/obj/item/towel, -/obj/random/soap, -/turf/simulated/floor/tiled/freezer, -/area/medical/washroom) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "tKk" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille/diagonal{ @@ -24503,10 +24594,8 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) "tQA" = ( -/obj/machinery/vending/cola, -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "tRy" = ( @@ -24757,17 +24846,21 @@ /turf/template_noop, /area/template_noop) "ubX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "uce" = ( /obj/structure/cable/green{ @@ -25306,9 +25399,6 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "uBQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25321,6 +25411,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "uBS" = ( @@ -25490,20 +25584,20 @@ /area/horizon/maintenance/deck_three/aft/starboard) "uJa" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green{ + dir = 6 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) @@ -25778,14 +25872,10 @@ /turf/simulated/floor/tiled/full, /area/horizon/longbow) "uQD" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass/alt, +/obj/structure/table/standard, +/obj/item/material/ashtray/glass, +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "uRa" = ( /obj/effect/floor_decal/corner_wide/paleblue, @@ -26098,16 +26188,21 @@ /turf/simulated/floor/marble/dark, /area/bridge/minibar) "vfv" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/railing/mapped{ + dir = 8 }, /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_x = 32 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/starboard) "vgn" = ( /obj/machinery/door/firedoor, @@ -26316,25 +26411,10 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "vlC" = ( -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 8 - }, -/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/machinery/door/airlock/medical{ - name = "Staff Showers"; - req_access = list(5) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "vlW" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27213,10 +27293,11 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "vXo" = ( -/obj/structure/curtain/open/shower, -/obj/machinery/door/window/eastleft, -/obj/machinery/shower{ - pixel_y = 24 +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled/freezer, /area/medical/washroom) @@ -27450,12 +27531,12 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "wim" = ( -/obj/machinery/firealarm/south, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/washing_machine, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "wiJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -27813,11 +27894,15 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "wus" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/starboard) "wuA" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/item/crowbar/red, @@ -27910,23 +27995,20 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "wAv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/floor_decal/corner_wide/green{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/structure/disposalpipe/junction{ - dir = 1 +/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" }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) @@ -28698,7 +28780,7 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/security/vacantoffice) @@ -28889,19 +28971,10 @@ /turf/simulated/floor/carpet, /area/journalistoffice) "xki" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "xkk" = ( /obj/effect/floor_decal/corner/beige/diagonal, @@ -28984,15 +29057,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "xon" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/washroom) +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "xoR" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -29149,9 +29217,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) "xuB" = ( -/obj/machinery/vending/coffee, -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/bed/stool/chair{ + dir = 1 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) @@ -29244,11 +29312,14 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "xAc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/vending/zora, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/turf/simulated/floor/tiled, -/area/security/vacantoffice) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_three/primary/starboard) "xAy" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/vending/cola, @@ -29616,12 +29687,12 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "xQp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "xQZ" = ( @@ -29883,22 +29954,20 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "yjY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "ykD" = ( /obj/structure/railing/mapped, @@ -42751,17 +42820,17 @@ fHD hzU hzU cEy -gvG -gvG +cEy +cEy qGg fxk gvG -fxk cEy -cEy -cEy -cEy -iEg +kvM +kvM +kvM +kvM +tjt trI iEg uba @@ -42954,18 +43023,18 @@ heB vLH vLY vXo -tJS -svx -svx -oRM -wim vLY +svx +snv +oRM +vLY +xAc xon beL -vLY +vlC wUS irl -mqJ +oVD piX iYp eWn @@ -43160,12 +43229,12 @@ hdq acp oIL eny -wus -jvs -ccQ -gqw vLY -jIW +jvs +gqw +gqw +gqw +rWG irl lEq piX @@ -43358,18 +43427,18 @@ jvq kdj vLY rhm -dGU +vLY opw rTk ooA vLY -vLY -vLY -vLY -vLY +iya +yjY +tJS +ouY ouY uJa -vvG +qVa ogA aCy ogp @@ -43562,14 +43631,14 @@ vLY vLY vLY vLY +dZt vLY -vlC vLY biw -xuB -tQA +lki +mqJ oaY -rWG +xki xki nvd piX @@ -43764,16 +43833,16 @@ qSM gHo rXj kvB -iya pBE +lsZ ajj jWd +hzK +lNe +wus bbV bbV -bbV -bbV -qVa -uwr +qub piX tbL krs @@ -43967,11 +44036,11 @@ vvg joR rRE wAv -qrw -rwk -efl -lEE -lEE +rZu +ajj +ePx +oMC +ePx lEE iyP ubX @@ -44169,15 +44238,15 @@ ode jFO iGt uBQ -rZu -ajj -dZt -oMC -ePx -nIW -tQj -mjH +qrw +rwk +efl +kWB mqJ +nIW +jns +uQD +wim afN cyz cyz @@ -44373,13 +44442,13 @@ uAy xJU lls sPO -nmD -uQD -jns +wUS +lki +mqJ sWB qxO -mjH -mqJ +tQA +xuB afN cyz cyz @@ -44575,11 +44644,11 @@ iBF bxN rwV sPO -snv +wUS fUZ -fUZ -fUZ -rWG +dGU +enM +jIW mjH enM azr @@ -44779,12 +44848,12 @@ kZM sPO wUS lki -ney -xQp +nAX +lRK xQp tGz -qub -yjY +lRK +tQj ney vvG mtE @@ -44980,11 +45049,11 @@ hhn lzn sPO wUS -qVa -nAX +lki +kRs vfv -lRK -lRK +nmD +ccQ cHl bWU otj @@ -45182,14 +45251,14 @@ grI nbM sPO wUS -qVa +lki uwr rpX gdT gdT rpX -gTR rpX +gTR rpX mzm wNz @@ -45390,8 +45459,8 @@ gdT ihI gqJ qhK -kQw wEU +kQw itg mzm xpV @@ -45586,13 +45655,13 @@ eQq tVW oIc wUS -qVa +lki mqJ gdT hNQ rHb aBF -lsZ +aBF maM dmv mzm @@ -45788,14 +45857,14 @@ hpb sXJ oIc wUS -qVa +lki mqJ wNM xHL bas iPE +bas cfP -kRs nDj mzm jwd @@ -45990,13 +46059,13 @@ dZY uwD oIc wUS -qVa +lki mqJ gdT vKR bas bas -xAc +bas xci bjF mzm @@ -46192,7 +46261,7 @@ kYv kvl oIc wUS -qVa +lki mqJ gdT rBA