From a593ae9980e9a4cac113edb861a9bf4733cf65c7 Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Sat, 6 Jan 2024 14:16:29 +0100 Subject: [PATCH] Operations stairs-lift swap (#18134) * pain * 5 * a * cc * oops * tests rerun please --------- Co-authored-by: DreamySkrell <> --- .../DreamySkrell-ops-stairs-lift-swap.yml | 41 +++ maps/sccv_horizon/code/sccv_horizon_lifts.dm | 15 +- maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 207 +++++++------- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 265 +++++++++--------- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 147 +++++----- 5 files changed, 347 insertions(+), 328 deletions(-) create mode 100644 html/changelogs/DreamySkrell-ops-stairs-lift-swap.yml diff --git a/html/changelogs/DreamySkrell-ops-stairs-lift-swap.yml b/html/changelogs/DreamySkrell-ops-stairs-lift-swap.yml new file mode 100644 index 00000000000..9bc21e16f63 --- /dev/null +++ b/html/changelogs/DreamySkrell-ops-stairs-lift-swap.yml @@ -0,0 +1,41 @@ +################################ +# 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: "Operations stairs-lift swap places." diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm index 9c2d33a85fb..bf6d53fad10 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -106,32 +106,23 @@ //Operations Lift /datum/shuttle/autodock/multi/lift/operations name = "Operations Lift" - current_location = "nav_operations_lift_second_deck" + current_location = "nav_operations_lift_first_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" - landmark_flags = SLANDMARK_FLAG_AUTOSET - base_area = /area/operations/loading + base_area = /area/operations/storage 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" - 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_area = /area/operations/office base_turf = /turf/simulated/open /obj/machinery/computer/shuttle_control/multi/lift/operations diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 79f5a3717f7..a53baa38774 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -2199,11 +2199,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "bDQ" = ( -/obj/structure/stairs_railing{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/operations/storage) +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/operations_lift) "bEk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3043,8 +3043,7 @@ /turf/simulated/floor/plating, /area/turbolift/research/deck_1) "clf" = ( -/obj/effect/shuttle_landmark/lift/operations_first_deck, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/operations/loading) "clG" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -3275,27 +3274,15 @@ /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{ +/obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ - pixel_x = -31; - pixel_y = 26 +/obj/machinery/computer/shuttle_control/multi/lift/operations{ + pixel_x = 8; + pixel_y = 2 }, -/turf/simulated/floor/tiled, -/area/operations/loading) +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/operations_lift) "cty" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ @@ -3660,10 +3647,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/camera/network/supply{ - c_tag = "Operations - Warehouse Entrance"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/operations/loading) "cDa" = ( @@ -4821,11 +4804,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/operations/loading) "dsG" = ( /obj/structure/cable/green{ @@ -4986,7 +4966,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/operations) "dBb" = ( @@ -7283,12 +7262,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/operations/loading) "fbu" = ( @@ -7436,7 +7415,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/alarm/north, /turf/simulated/floor/plating, /area/maintenance/operations) @@ -7541,6 +7519,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "fja" = ( @@ -9334,7 +9315,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/operations) @@ -9728,6 +9708,9 @@ /obj/item/paper_bin, /obj/item/pen, /obj/item/device/cratescanner, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "gGE" = ( @@ -11321,12 +11304,8 @@ }, /area/medical/morgue/lower) "hRn" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, /area/operations/loading) "hRo" = ( /obj/effect/floor_decal/industrial/warning, @@ -13925,6 +13904,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/storage) "jKF" = ( @@ -14547,6 +14527,9 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/operations/storage) "kmo" = ( @@ -17690,6 +17673,9 @@ icon_state = "pipe-c" }, /obj/structure/railing/mapped, +/obj/machinery/firealarm/west{ + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/operations/loading) "mpV" = ( @@ -24373,6 +24359,10 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, +/obj/machinery/computer/shuttle_control/multi/lift/operations{ + pixel_x = 8; + pixel_y = 2 + }, /turf/simulated/floor/tiled, /area/operations/storage) "qXZ" = ( @@ -24889,9 +24879,6 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, -/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ - pixel_y = 26 - }, /turf/simulated/floor/tiled, /area/operations/loading) "rpB" = ( @@ -28276,23 +28263,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "tMa" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/stairs/west, +/obj/structure/stairs_lower/stairs_upper{ + pixel_y = 32 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 0; - dir = 2; - name = "Warehouse Elevator"; - req_one_access = list(26,29,31,48,67) - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/operations/loading) "tMp" = ( /obj/structure/cable/green{ @@ -29002,18 +28977,13 @@ }, /area/shuttle/canary) "ulE" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/stairs/west, +/obj/structure/stairs_lower{ + dir = 1; + pixel_y = -23 }, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 0; - name = "Warehouse Elevator"; - req_one_access = list(26,29,31,48,67) - }, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/dark, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, /area/operations/loading) "ulJ" = ( /obj/effect/floor_decal/industrial/warning, @@ -29386,7 +29356,26 @@ /turf/space, /area/horizon/exterior) "uzB" = ( -/turf/simulated/floor/plating, +/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/camera/network/supply{ + c_tag = "Operations - Warehouse Entrance"; + dir = 2 + }, +/turf/simulated/floor/tiled, /area/operations/loading) "uzC" = ( /obj/effect/floor_decal/corner_wide/black{ @@ -29470,10 +29459,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"uBL" = ( -/obj/structure/sign/crush, -/turf/simulated/wall, -/area/operations/loading) "uBW" = ( /obj/structure/window/shuttle/unique/scc/scout{ icon_state = "4,2" @@ -30477,6 +30462,9 @@ /obj/item/device/hand_labeler, /obj/item/device/destTagger, /obj/item/stack/packageWrap, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "vjA" = ( @@ -32949,6 +32937,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/operations/storage) "wZi" = ( @@ -33616,12 +33607,11 @@ /turf/simulated/floor/tiled, /area/horizon/custodial) "xqn" = ( -/obj/structure/stairs_railing{ - dir = 4; - pixel_x = -32 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/operations/storage) +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/operations_lift) "xqo" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ layer = 2.8 @@ -34773,11 +34763,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/firealarm/west{ - pixel_x = -24 +/obj/machinery/light/small/emergency{ + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/operations/loading) "ybl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -34875,9 +34864,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/storage/tech) "yeo" = ( -/obj/structure/stairs/north, -/turf/simulated/floor/tiled, -/area/operations/storage) +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/effect/shuttle_landmark/lift/operations_first_deck, +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/operations_lift) "yeB" = ( /obj/item/modular_computer/console/preset/civilian{ dir = 4 @@ -34926,13 +34918,10 @@ /area/hangar/auxiliary) "yhf" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/operations/loading) "yib" = ( /obj/machinery/light/small/red{ @@ -47124,7 +47113,7 @@ kOJ lNG uGI qdE -yeo +crZ xqn klR qWW @@ -47528,9 +47517,9 @@ sLl iJt owP gtM -nYx -drY yaP +drY +nYx cCv arw mpI @@ -47732,8 +47721,8 @@ qkh qkh feY gvZ -qMM -qMM +gvZ +gvZ gvZ sgp buS @@ -47935,10 +47924,10 @@ tRQ xGe dAZ gvZ -uzB -uzB +tMa ulE -crZ +gvZ +uzB qDJ wlh gvZ @@ -48136,11 +48125,11 @@ bGl iJR pqh qkh -vqU +fCT gvZ clf -uzB hRn +gvZ ehD qDJ eFe @@ -48342,8 +48331,8 @@ qkh baV gvZ yhf -tMa -uBL +yhf +gvZ fbc lNj eFe diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 3338c8450aa..83c0db7b90e 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -750,24 +750,22 @@ /turf/simulated/floor/wood, /area/hallway/engineering) "arK" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 0; - dir = 2; - name = "Warehouse Elevator"; - req_one_access = list(26,29,31,48,67) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/operations/office) "arV" = ( /obj/structure/cable{ @@ -1343,17 +1341,6 @@ }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) -"aBq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/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/operations_lift) "aBr" = ( /obj/effect/floor_decal/corner/mauve{ dir = 5 @@ -1551,6 +1538,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/port) +"aGz" = ( +/obj/effect/map_effect/window_spawner/full/reinforced{ + layer = 2 + }, +/turf/simulated/floor/plating, +/area/operations/office) "aHj" = ( /obj/effect/floor_decal/corner/dark_blue/full, /obj/structure/cable/green{ @@ -5362,6 +5355,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/operations/office) "cre" = ( @@ -10306,16 +10302,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/brown/full{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled, /area/operations/office) "eUj" = ( @@ -12529,15 +12525,10 @@ /turf/simulated/floor/reinforced, /area/horizon/bar) "fRi" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/operations/office) "fSg" = ( /obj/effect/floor_decal/spline/plain/corner, @@ -13353,10 +13344,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar) "giP" = ( -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/railing/mapped, /turf/simulated/open, /area/operations/office) "gjl" = ( @@ -16218,6 +16208,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "hyL" = ( @@ -16226,12 +16219,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/telesci) -"hzm" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/operations_lift) "hzC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16982,11 +16969,18 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "hQE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/operations_lift) +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/computer/shuttle_control/multi/lift/operations{ + pixel_x = 8; + pixel_y = 2 + }, +/turf/simulated/floor/tiled, +/area/operations/office) "hQI" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -17160,12 +17154,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/zta) -"hUP" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/open, -/area/operations/office) "hUW" = ( /obj/machinery/door/airlock/glass_service{ dir = 4; @@ -17775,13 +17763,16 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_hard) "iku" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/stairs_lower{ + dir = 2; + pixel_y = -23 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/stairs_lower/stairs_upper{ + pixel_y = 32; + dir = 4 + }, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, /area/operations/office) "ikB" = ( /obj/machinery/light, @@ -22731,6 +22722,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/operations/office) "kFa" = ( @@ -23082,10 +23074,7 @@ name = "Operations"; sortType = "Cargo" }, -/obj/effect/floor_decal/corner/brown{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/operations/office) "kOW" = ( /obj/structure/bed/stool/chair/padded/black{ @@ -23965,11 +23954,9 @@ /turf/simulated/floor/tiled/full, /area/engineering/engine_airlock) "llp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/operations_lift) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/full, +/area/operations/office) "llB" = ( /obj/machinery/light/small{ dir = 4 @@ -25277,9 +25264,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "lSK" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, +/obj/effect/shuttle_landmark/lift/operations_second_deck, /turf/simulated/open, /area/operations/office) "lST" = ( @@ -27082,10 +27067,8 @@ 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 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, /area/operations/office) @@ -29548,7 +29531,13 @@ "nOS" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/brown{ - dir = 6 + dir = 4 + }, +/obj/structure/sign/drop{ + desc = "A warning sign which reads 'DANGER: FALLING HAZARD'."; + name = "\improper DANGER: FALLING HAZARD sign"; + pixel_x = 32; + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/operations/office) @@ -29674,11 +29663,13 @@ /turf/simulated/floor/plating, /area/rnd/hallway) "nTB" = ( -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing/mapped, -/turf/simulated/open, +/turf/simulated/floor/tiled, /area/operations/office) "nTF" = ( /obj/structure/disposalpipe/segment{ @@ -29943,6 +29934,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "oaQ" = ( @@ -35841,11 +35835,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/brown{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "qSH" = ( @@ -37134,19 +37130,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "ryq" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 0; - name = "Warehouse Elevator"; - req_one_access = list(26,29,31,48,67) - }, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/operations/office) "ryu" = ( /obj/structure/cable{ @@ -37476,16 +37466,14 @@ /area/horizon/kitchen) "rHw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/operations/office) "rHW" = ( /obj/effect/floor_decal/corner/brown, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/operations/office) "rId" = ( @@ -40089,6 +40077,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "taf" = ( @@ -40837,6 +40828,15 @@ /obj/effect/floor_decal/corner_wide/orange/full, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) +"tqN" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/operations/office) "tre" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -42382,11 +42382,21 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "ubZ" = ( -/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" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/wall, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/light, +/turf/simulated/floor/tiled, /area/operations/office) "uci" = ( /obj/structure/disposalpipe/segment{ @@ -51878,6 +51888,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/office) "yhR" = ( @@ -51889,18 +51902,8 @@ /turf/simulated/floor/tiled/white, /area/operations/lower/machinist) "yig" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 - }, -/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{ - dir = 8; - pixel_x = 24; - pixel_y = 24 - }, +/obj/structure/stairs/east, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/operations/office) "yiz" = ( @@ -63702,8 +63705,8 @@ rkq lhP kRZ rHW -oDl -oDl +hQE +nTB yhL rtF rew @@ -63905,8 +63908,8 @@ ecx kRZ kEY lSK -giP -kRZ +rSG +ryq mUW kmc kmc @@ -64106,9 +64109,9 @@ hGE ciP kRZ kEY -hUP -nTB -kRZ +rSG +rSG +ryq mGc rVg sTu @@ -64510,7 +64513,7 @@ eDW ewb mKA nOS -nOS +llp rHw kOE tsA @@ -64712,10 +64715,10 @@ rVg kXS rVg fRi +oDl +tqN +oDl arK -ubZ -kRZ -rtF rVg pNw dum @@ -64913,11 +64916,11 @@ cAb cAb sUj rVg -hzm -hQE -ryq -kRZ -rtF +giP +rSG +aGz +iku +ubZ rVg gVs dum @@ -65115,9 +65118,9 @@ aML gLL bgS rVg -aBq -llp -iku +rSG +rSG +aGz yig eUa rVg diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 7fdadecbfe9..9bea6fce71a 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -57,10 +57,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "acp" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1130,6 +1126,13 @@ }, /turf/simulated/floor/wood, /area/lawoffice/representative_two) +"aPR" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/operations/office_aux) "aQk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_security{ @@ -1569,9 +1572,6 @@ /area/tcommsat/chamber) "bbA" = ( /obj/machinery/recharge_station, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, @@ -1802,9 +1802,6 @@ /turf/simulated/floor/tiled/full, /area/bridge) "bkj" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/effect/floor_decal/corner/brown{ dir = 9 }, @@ -5506,11 +5503,22 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "eny" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/full, -/area/operations/office_aux) +/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" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/horizon/hallway/deck_three/primary/starboard) "enA" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/table/wood, @@ -5663,6 +5671,9 @@ dir = 1 }, /obj/machinery/firealarm/south, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/office_aux) "erV" = ( @@ -7416,18 +7427,13 @@ /turf/simulated/floor/carpet, /area/crew_quarters/captain) "fxk" = ( -/obj/machinery/door/window/northleft, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/computer/shuttle_control/multi/lift/operations{ - pixel_x = -27; - pixel_y = 16 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/operations/office_aux) "fxm" = ( @@ -8921,11 +8927,8 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_three/aft/starboard) "gvG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/light, -/turf/simulated/floor/tiled/full, +/turf/simulated/open, /area/operations/office_aux) "gvP" = ( /obj/effect/floor_decal/industrial/warning, @@ -9835,9 +9838,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "hdq" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/table/standard, /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -9847,12 +9847,6 @@ /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_x = -2; pixel_y = 2 @@ -13091,6 +13085,10 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) +"jnj" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) "jns" = ( /obj/structure/bed/stool/chair, /obj/effect/floor_decal/corner/dark_green/diagonal, @@ -20625,7 +20623,10 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/device/radio/intercom/east{ + pixel_x = 10; + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/operations/office_aux) "ooI" = ( @@ -20676,7 +20677,6 @@ /turf/simulated/floor/wood, /area/bridge/upperdeck) "opw" = ( -/obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ dir = 6 }, @@ -21196,12 +21196,18 @@ /turf/simulated/floor, /area/maintenance/bridge) "oIL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/operations/office_aux) @@ -22008,8 +22014,9 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "prh" = ( -/obj/effect/shuttle_landmark/lift/operations_third_deck, -/turf/simulated/open, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled, /area/operations/office_aux) "psa" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -22101,6 +22108,10 @@ }, /turf/simulated/floor/tiled/full, /area/bridge) +"pwt" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/full, +/area/operations/office_aux) "pwL" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/external, @@ -23561,7 +23572,8 @@ "qGg" = ( /obj/machinery/door/airlock/mining{ dir = 1; - req_one_access = list(26,29,31,48,67) + req_one_access = list(26,29,31,48,67); + name = "Operations Bay" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25385,7 +25397,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 4 }, @@ -26037,21 +26048,16 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "snv" = ( -/obj/machinery/door/window/northright, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, /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" + dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/operations/office_aux) "soE" = ( @@ -32504,7 +32510,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -33138,18 +33143,8 @@ /turf/simulated/floor/tiled, /area/bridge) "xon" = ( -/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" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) @@ -47055,8 +47050,8 @@ bWc hzU gzJ oWf -svx -svx +aPR +pwt fxk gvG rhm @@ -47258,11 +47253,11 @@ vLH iSt oWf prh -svx +jnj snv -oRM -qGg -xAc +svx +hCi +iya xon mqJ vlC @@ -47462,10 +47457,10 @@ oWf hdq acp oIL +oRM +qGg +xAc eny -hCi -iya -uOA iHj gqw rWG