From b9ebffcc7967c4010bcef5325176411eae84eb7d Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:23:09 +0100 Subject: [PATCH] Horizon remap external airlock spawners to airlock markers (#17703) * a * ay * a * jjjjjjjjjjjj * c * tests rerun please * oops * tests rerun please * tests rerun please --------- Co-authored-by: DreamySkrell <> --- ...rell-horizon-airlock-spawner-to-marker.yml | 41 ++ maps/helpers/guidelines_airlocks.dmm | 503 +++++++++++---- maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 609 ++++++++++++++---- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 542 ++++++++++++++-- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 241 ++++++- 5 files changed, 1608 insertions(+), 328 deletions(-) create mode 100644 html/changelogs/DreamySkrell-horizon-airlock-spawner-to-marker.yml diff --git a/html/changelogs/DreamySkrell-horizon-airlock-spawner-to-marker.yml b/html/changelogs/DreamySkrell-horizon-airlock-spawner-to-marker.yml new file mode 100644 index 00000000000..3c018d8ed3c --- /dev/null +++ b/html/changelogs/DreamySkrell-horizon-airlock-spawner-to-marker.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: "Remaps all of Horizon's external access airlocks to airlock markers, from airlock spawners." diff --git a/maps/helpers/guidelines_airlocks.dmm b/maps/helpers/guidelines_airlocks.dmm index f9530c8b880..62eff2ce4d4 100644 --- a/maps/helpers/guidelines_airlocks.dmm +++ b/maps/helpers/guidelines_airlocks.dmm @@ -22,6 +22,10 @@ }, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"cp" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/template_noop, +/area/template_noop) "cH" = ( /obj/machinery/door/airlock/external{ dir = 2 @@ -29,6 +33,12 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/template_noop) +"cO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) "dk" = ( /obj/machinery/door/airlock/external{ dir = 2 @@ -47,6 +57,19 @@ /obj/effect/map_effect/map_helper/mark_good, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"fC" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + pixel_y = -20; + pixel_x = 6 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20; + pixel_x = -6 + }, +/turf/template_noop, +/area/template_noop) "gk" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 @@ -57,6 +80,12 @@ }, /turf/simulated/floor/plating, /area/template_noop) +"gv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/template_noop, +/area/template_noop) "hi" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/lattice/catwalk/indoor/grate, @@ -81,9 +110,55 @@ "kZ" = ( /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"lh" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) +"mk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/template_noop, +/area/template_noop) +"mo" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 + }, +/turf/template_noop, +/area/template_noop) "nd" = ( /turf/simulated/wall, /area/template_noop) +"nz" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + pixel_y = -20 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = 0; + pixel_x = -20 + }, +/turf/template_noop, +/area/template_noop) "oq" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -132,6 +207,19 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/airless, /area/template_noop) +"qk" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = -6; + pixel_x = -20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4; + pixel_y = 6 + }, +/turf/template_noop, +/area/template_noop) "qS" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/portables_connector{ @@ -143,6 +231,19 @@ /obj/effect/map_effect/map_helper/mark_bad, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"sx" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/turf/template_noop, +/area/template_noop) "sN" = ( /obj/machinery/access_button{ pixel_x = 24; @@ -170,6 +271,10 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/template_noop) +"wT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/template_noop, +/area/template_noop) "xW" = ( /obj/machinery/access_button{ pixel_x = 24; @@ -215,6 +320,12 @@ }, /turf/simulated/floor/plating, /area/template_noop) +"BE" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) "Cu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 @@ -224,6 +335,12 @@ "DW" = ( /turf/template_noop, /area/template_noop) +"EC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/template_noop, +/area/template_noop) "EH" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -316,6 +433,10 @@ }, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"Km" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/template_noop, +/area/template_noop) "KX" = ( /obj/machinery/door/airlock/external{ dir = 2 @@ -351,6 +472,12 @@ "Lt" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/template_noop) +"LF" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/turf/template_noop, +/area/template_noop) "LJ" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -362,6 +489,12 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/template_noop) +"Nr" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 + }, +/turf/template_noop, +/area/template_noop) "NH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/door/airlock/external{ @@ -395,6 +528,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"PU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/template_noop, +/area/template_noop) "Ql" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -470,10 +609,22 @@ }, /turf/simulated/floor/plating, /area/template_noop) +"TP" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) "UO" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/dark/full, /area/template_noop) +"US" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) "Vo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 @@ -527,6 +678,87 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/template_noop) +"Wn" = ( +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = 28; + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = -28; + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = -28; + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = 28; + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = -28; + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = -20; + pixel_y = -28; + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -20; + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = -19; + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = 28; + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = -20; + pixel_y = 28; + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 32; + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 32; + dir = 2 + }, +/turf/template_noop, +/area/template_noop) "Wz" = ( /obj/machinery/door/airlock/external{ dir = 2 @@ -554,6 +786,24 @@ }, /turf/simulated/floor/plating, /area/template_noop) +"WW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"Xw" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"XT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) "Yf" = ( /obj/machinery/door/airlock/external{ dir = 2 @@ -570,6 +820,25 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/template_noop) +"Yo" = ( +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8 + }, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28 + }, +/turf/template_noop, +/area/template_noop) "Yr" = ( /obj/machinery/airlock_sensor{ pixel_x = -20; @@ -753,7 +1022,7 @@ nd nd nd nd -nd +DW nd nd nd @@ -833,9 +1102,9 @@ DW DW DW DW +nd DW -DW -DW +nd DW DW DW @@ -914,17 +1183,17 @@ DW DW DW DW +nd +DW +nd DW DW +Lt DW DW -DW -DW -DW -DW -DW -DW -DW +Km +EC +lh DW nd DW @@ -995,17 +1264,17 @@ DW DW DW DW +nd DW +nd DW +Lt +Wn +Lt DW -DW -DW -DW -DW -DW -DW -DW -DW +WW +mk +BE DW nd DW @@ -1076,17 +1345,17 @@ du DW DW DW +nd +DW +nd DW DW +Lt DW DW -DW -DW -DW -DW -DW -DW -DW +Km +gv +Nr DW nd DW @@ -1157,17 +1426,17 @@ du DW DW DW +nd +DW +nd DW DW DW DW DW -DW -DW -DW -DW -DW -DW +WW +PU +Xw DW nd DW @@ -1238,9 +1507,9 @@ du DW DW DW +nd DW -DW -DW +nd DW DW DW @@ -1319,17 +1588,17 @@ du DW DW DW +nd +DW +nd DW DW +Lt DW DW +XT DW -DW -DW -DW -DW -DW -DW +TP DW nd DW @@ -1400,17 +1669,17 @@ du DW DW DW +nd DW +nd DW +Lt +nz +Lt DW -DW -DW -DW -DW -DW -DW -DW -DW +US +cp +LF DW nd DW @@ -1481,17 +1750,17 @@ du DW DW DW +nd +DW +nd DW DW +Lt DW DW -DW -DW -DW -DW -DW -DW -DW +cO +cp +TP DW nd DW @@ -1562,17 +1831,17 @@ DW DW DW DW +nd +DW +nd DW DW DW DW DW +wT DW -DW -DW -DW -DW -DW +LF DW nd DW @@ -1643,9 +1912,9 @@ DW DW DW DW +nd DW -DW -DW +nd DW DW DW @@ -1724,15 +1993,15 @@ DW DW DW DW +nd +DW +nd DW DW +Lt DW DW -DW -DW -DW -DW -DW +sx DW DW DW @@ -1805,18 +2074,18 @@ du DW DW DW +nd DW +nd DW +Lt +Yo +Lt DW -DW -DW -DW -DW -DW -DW -DW -DW -DW +Lt +fC +Lt +mo nd DW nd @@ -1886,15 +2155,15 @@ du DW DW DW +nd +DW +nd DW DW +Lt DW DW -DW -DW -DW -DW -DW +qk DW DW DW @@ -1967,9 +2236,9 @@ du DW DW DW +nd DW -DW -DW +nd DW DW DW @@ -2048,18 +2317,18 @@ du DW DW DW +nd DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW +nd +nd +nd +nd +nd +nd +nd +nd +nd +nd nd DW nd @@ -2129,20 +2398,20 @@ du DW DW DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW nd DW +DW +DW +DW +DW +DW +DW +DW +DW +DW +DW +DW +DW nd DW DW @@ -2210,18 +2479,18 @@ du DW DW DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW -DW +nd +nd +nd +nd +nd +nd +nd +nd +nd +nd +nd +nd nd DW nd diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 7ef9cdb2d18..bce79c5a2f4 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -1718,13 +1718,22 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "bpI" = ( -/obj/structure/closet, -/obj/random/loot, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/machinery/door/airlock/external{ + dir = 4 }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 32; + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard/deck1) +/area/maintenance/hangar/starboard) "bpL" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/corner/dark_blue/diagonal, @@ -4757,6 +4766,23 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"dro" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -20; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "drK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/effect/floor_decal/industrial/outline/yellow, @@ -5135,6 +5161,20 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "dGu" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; + name = "airlock_horizon_deck_1_aft_propulsion_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "dHW" = ( @@ -5153,13 +5193,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "dIM" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard/deck1) +/area/maintenance/hangar/starboard) "dIS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5400,8 +5443,23 @@ /turf/space/dynamic, /area/horizon/exterior) "dPt" = ( -/obj/machinery/light/small/emergency{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = -6; + pixel_x = -20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4; + pixel_y = 6 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_starboard_1"; + name = "airlock_horizon_deck_1_starboard_1"; + frequency = 1003 }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) @@ -5985,8 +6043,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/brigdoor/northright, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "epr" = ( @@ -6010,7 +6066,6 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "eqa" = ( @@ -6370,9 +6425,20 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "eBb" = ( -/obj/effect/map_effect/airlock/s_to_n, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/engineering/atmos/propulsion/starboard) +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "eBj" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{ frequency = 1442; @@ -6405,6 +6471,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/structure/closet, +/obj/random/loot, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "eDa" = ( @@ -7147,6 +7215,11 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/custodial) +"eZM" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/airless, +/area/template_noop) "eZW" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "13,3" @@ -7309,6 +7382,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) +"feI" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "feW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -8870,9 +8955,6 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/door/window/northright{ - name = "Canister Access" - }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "gex" = ( @@ -9803,11 +9885,16 @@ /obj/machinery/alarm/north, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/living_quarters_lift) +"gNo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/airless, +/area/template_noop) "gNs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "gOa" = ( @@ -10683,8 +10770,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/tiled/dark, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; + name = "airlock_horizon_deck_1_aft_propulsion_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "hqV" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -11482,6 +11577,9 @@ "iab" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) @@ -12049,7 +12147,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "iAP" = ( @@ -13047,8 +13144,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -20; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; + name = "airlock_horizon_deck_1_aft_propulsion_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "jiS" = ( /obj/machinery/light_switch{ @@ -13318,6 +13428,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/green, /turf/simulated/floor/tiled, /area/hallway/engineering) +"jun" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_starboard_1"; + name = "airlock_horizon_deck_1_starboard_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/deck1) "juI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15353,6 +15483,23 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) +"kMC" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; + name = "airlock_horizon_deck_1_aft_propulsion_2"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/engineering/atmos/propulsion) "kMG" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -15940,12 +16087,20 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "lnQ" = ( -/obj/effect/map_effect/airlock/w_to_e/long/square{ - name = "Deck 1 Fore Maintenance Airlock (1004)"; - radio_frequency = 1004 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/maintenance/hangar/starboard) +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_starboard_1"; + name = "airlock_horizon_deck_1_starboard_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/deck1) "loq" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -16371,6 +16526,10 @@ /obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) +"lFD" = ( +/obj/machinery/alarm/south, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion/starboard) "lFS" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 8 @@ -16801,6 +16960,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) +"lRC" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "lRH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17306,8 +17474,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "mhL" = ( -/obj/machinery/light/small/emergency{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; + name = "airlock_horizon_deck_1_aft_propulsion_2"; + frequency = 1003 }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) @@ -17707,6 +17880,18 @@ }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"mvN" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "mvO" = ( /turf/simulated/wall/shuttle/unique/scc/research{ icon_state = "7,20" @@ -18910,11 +19095,15 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "nmP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "nmQ" = ( @@ -19235,6 +19424,17 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"nvZ" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "nwp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/white{ @@ -19810,6 +20010,21 @@ }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cargo_bay) +"nQN" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "nQT" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "12,4"; @@ -20033,8 +20248,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/brigdoor/northright, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "nZp" = ( @@ -20419,7 +20632,6 @@ /turf/simulated/floor/plating, /area/horizon/custodial/disposals) "omL" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -21025,10 +21237,19 @@ /turf/simulated/wall, /area/outpost/mining_main/eva) "oOI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "oPw" = ( @@ -21130,6 +21351,14 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, /turf/simulated/floor/plating, /area/maintenance/research_port) "oVe" = ( @@ -21951,6 +22180,23 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "pwQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = 28; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; + name = "airlock_horizon_deck_1_aft_propulsion_2"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) "pxH" = ( @@ -22889,16 +23135,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) "qco" = ( -/obj/machinery/door/window/northleft, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard/deck1) +/area/maintenance/research_port) "qcr" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -23277,12 +23523,25 @@ /turf/simulated/floor/tiled/white, /area/storage/eva) "qpJ" = ( -/obj/effect/map_effect/airlock{ - name = "Deck 1 Starboard Aft Maintenance Airlock (1001)"; - radio_frequency = 1001 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/maintenance/wing/starboard/deck1) +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_port_1"; + name = "airlock_horizon_deck_1_aft_port_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "qpO" = ( /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) @@ -24723,6 +24982,22 @@ icon_state = "14,24" }, /area/shuttle/intrepid/engine_compartment) +"rqc" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_starboard_1"; + name = "airlock_horizon_deck_1_starboard_1"; + frequency = 1003 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = -28; + dir = 2 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/deck1) "rqf" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, @@ -24855,6 +25130,14 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) +"rsS" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "rtb" = ( /obj/structure/table/stone/marble, /obj/machinery/light/small{ @@ -24864,12 +25147,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "rtC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, -/area/maintenance/hangar/starboard) +/area/maintenance/wing/starboard/deck1) "rtF" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "2,9" @@ -25907,6 +26188,10 @@ temperature = 278.15 }, /area/medical/morgue/lower) +"skE" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark/airless, +/area/template_noop) "skS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -26692,6 +26977,20 @@ /obj/random/loot, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"sOI" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 + }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; + name = "airlock_horizon_deck_1_aft_propulsion_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/propulsion/starboard) "sPo" = ( /obj/structure/lattice, /obj/structure/grille, @@ -28974,11 +29273,24 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "uoG" = ( -/obj/effect/map_effect/airlock/e_to_w{ - name = "Deck 1 Port Thruster Airlock (1002)"; - radio_frequency = 1002 +/obj/machinery/light/small/emergency{ + dir = 1 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; + name = "airlock_horizon_deck_1_aft_propulsion_2"; + frequency = 1003 + }, +/turf/simulated/floor/plating, /area/engineering/atmos/propulsion) "uoI" = ( /obj/effect/floor_decal/industrial/outline/engineering, @@ -30619,10 +30931,19 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "vse" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "vsW" = ( /obj/effect/floor_decal/corner/dark_green/full, @@ -30702,10 +31023,6 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_a) "vxw" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, @@ -31123,13 +31440,20 @@ /area/engineering/atmos/propulsion/starboard) "vPu" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/light/small/emergency{ +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -20; + pixel_y = 28; dir = 4 }, -/obj/structure/platform_stairs/south_north_solo{ - dir = 1 +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "vQs" = ( @@ -33923,8 +34247,6 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/structure/window/reinforced, -/obj/machinery/door/window/brigdoor/northright, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xFo" = ( @@ -33973,7 +34295,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/alarm/south, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "xGW" = ( @@ -34415,7 +34736,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "xSR" = ( -/turf/simulated/floor/tiled/dark/full, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/machinery/light/small/emergency, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xTb" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -34559,11 +34890,30 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "xWM" = ( -/obj/machinery/light/small/emergency{ - dir = 4 +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; + name = "airlock_horizon_deck_1_aft_propulsion_1"; + frequency = 1003 }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) +"xWT" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_fore_1"; + name = "airlock_horizon_deck_1_fore_1"; + frequency = 1004 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "xXj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -34586,12 +34936,19 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "xXO" = ( -/obj/effect/map_effect/airlock/w_to_e/long/square/wide{ - name = "Deck 1 Port Maintenance Airlock (1003)"; - radio_frequency = 1003 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 }, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai) +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_1_starboard_1"; + name = "airlock_horizon_deck_1_starboard_1"; + frequency = 1003 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/deck1) "xXU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -43340,7 +43697,7 @@ eSV hTk ktZ jLm -qco +gdR hTk hoV hoV @@ -43748,7 +44105,7 @@ mPZ kbI hTk hTk -qpJ +hTk hoV dEC kVe @@ -43949,9 +44306,9 @@ eSV noz paL omL -sTw +jun dPt -sTw +rqc kVe kVe kVe @@ -44150,10 +44507,10 @@ eSV eSV eSV noz -dIM -hIf -hTk -hTk +paL +sTw +lnQ +xXO hTk noz noz @@ -44354,8 +44711,8 @@ eHZ hTk hTk gNs -fif -bpI +rtC +hTk hTk hTk acn @@ -48588,8 +48945,8 @@ eSV eSV kVe awJ +awJ auF -eBb awJ awJ eSV @@ -48792,7 +49149,7 @@ eSV kVe dGu xWM -dGu +sOI hqH awJ gsr @@ -49605,7 +49962,7 @@ szM szM xQU lYV -sfF +lFD awJ uZU gal @@ -52111,7 +52468,7 @@ iab vPu oOI nmP -bij +msv kVe eSV eSV @@ -52310,11 +52667,11 @@ ykR uJE raq wJg -rtC -msv +wJh +xWT +dIM xSR -xSR -lnQ +bij kVe eSV eSV @@ -52516,7 +52873,7 @@ iAL epn msv vse -xSR +rsS wHJ kVe eSV @@ -52718,8 +53075,8 @@ cir iAL xEu msv -xSR -xSR +bpI +mvN msv kVe eSV @@ -52921,9 +53278,9 @@ nWF epB nZb msv -xSR -xSR -msv +gNo +skE +ctz kVe eSV eSV @@ -53124,8 +53481,8 @@ nWF msv msv msv -kVe -kVe +gNo +eZM kVe kVe eSV @@ -57725,8 +58082,8 @@ eSV gdP uVL uVL -pwQ -uoG +kMC +uVL uVL aLK nSi @@ -57927,7 +58284,7 @@ eSV eSV uVL uVL -uVL +uoG mhL xBf swD @@ -60778,9 +61135,9 @@ cne uVL uVL rsL -vil +qpJ rsL -xXO +rUd rUd rUd rUd @@ -60980,9 +61337,9 @@ dLn dLn uVL uVL -vil -vil -vil +eBb +lRC +qco rUd xKI xre @@ -61184,8 +61541,8 @@ iPb uVL uVL oTX -vil -vil +nvZ +nQN rUd npz vmR @@ -61386,8 +61743,8 @@ eSV eSV uVL uVL -rsL -vil +feI +dro rsL rUd eNY @@ -61589,8 +61946,8 @@ eSV eSV eSV eSV -eSV -eSV +kVe +kVe qZp rUd jyg diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 40281ca2a14..b5fd38a757d 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2194,6 +2194,14 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "aVO" = ( @@ -2460,6 +2468,23 @@ /obj/machinery/alarm/east, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) +"bbl" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = -28; + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/wing/port/far) "bbI" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -2723,6 +2748,21 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) +"bkb" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "bkn" = ( /obj/machinery/firealarm/south, /obj/machinery/power/apc/west, @@ -3418,7 +3458,15 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/turf/simulated/floor/plating, /area/maintenance/wing/starboard) "bzh" = ( /turf/simulated/wall/r_wall, @@ -3650,11 +3698,15 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/secure_ammunition_storage) "bDn" = ( -/obj/effect/map_effect/airlock/long/square/wide{ - name = "Deck 3 Starboard Maintenance Airlock (3002)"; - radio_frequency = 3002 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/turf/simulated/floor, /area/maintenance/wing/port/far) "bDo" = ( /turf/simulated/wall/r_wall, @@ -5380,12 +5432,18 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/rust) "cww" = ( -/obj/effect/map_effect/airlock/s_to_n/long/square/wide{ - name = "Deck 2 Starboard Aft Maintenance Airlock (2001)"; - radio_frequency = 2001 +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/maintenance/wing/starboard) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "cwH" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -5424,6 +5482,15 @@ }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) +"cxn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/turf/simulated/floor, +/area/maintenance/wing/port/far) "cxu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -6181,6 +6248,24 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical) +"cSv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor, +/area/maintenance/wing/port/far) "cSN" = ( /obj/machinery/button/switch/crematorium{ _wifi_id = "xenobio_crema"; @@ -7165,6 +7250,21 @@ "dum" = ( /turf/simulated/floor/tiled, /area/operations/office) +"duG" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "dvf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8886,6 +8986,11 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, /turf/simulated/floor, /area/maintenance/wing/port/far) "ept" = ( @@ -9754,6 +9859,18 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) +"eKj" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "eKP" = ( /obj/structure/flora/pottedplant{ desc = "A tag with the name 'Harvey, Ph.D.' has been taped to the rim of this strange fern's plant pot."; @@ -9854,9 +9971,22 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/rust) "eOK" = ( -/obj/effect/map_effect/airlock/e_to_w, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/zta) +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "ePb" = ( /turf/simulated/wall/r_wall, /area/horizon/security/holding_cell_b) @@ -10666,6 +10796,22 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical) +"ffh" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/turf/simulated/floor, +/area/maintenance/wing/port/far) "ffP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -19873,6 +20019,20 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "jri" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_ai"; + name = "airlock_horizon_deck_2_ai"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "jrr" = ( @@ -22643,6 +22803,17 @@ /obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) +"kNH" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "kOt" = ( /obj/machinery/power/breakerbox{ RCon_tag = "Supermatter Grid Bypass" @@ -23747,8 +23918,9 @@ id = "cannon_external"; name = "External Blast Doors"; pixel_x = 7; - pixel_y = -23; - req_one_access = list(19,11) + pixel_y = -18; + req_one_access = list(19,11); + dir = 2 }, /obj/machinery/light/small, /obj/structure/window/reinforced{ @@ -24694,6 +24866,18 @@ /turf/simulated/floor/tiled/dark/full, /area/medical/main_storage) "lPd" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, /turf/simulated/floor, /area/maintenance/wing/port/far) "lPn" = ( @@ -25813,12 +25997,16 @@ /turf/simulated/floor/tiled/dark/full, /area/hallway/engineering) "mqE" = ( -/obj/effect/map_effect/airlock/s_to_n/long/square{ - name = "Deck 2 Supermatter Reactor Airlock (2002)"; - radio_frequency = 2002 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/engineering/engine_room) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_port_1"; + name = "airlock_horizon_deck_2_port_1"; + frequency = 3002 + }, +/turf/simulated/floor, +/area/maintenance/wing/port/far) "mqN" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/alarm/west, @@ -29401,6 +29589,24 @@ /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = -7; + pixel_x = -20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4; + pixel_y = 7 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_ai"; + name = "airlock_horizon_deck_2_ai"; + frequency = 2005 + }, /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "nYZ" = ( @@ -29423,12 +29629,16 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "nZj" = ( -/obj/effect/map_effect/airlock/e_to_w{ - name = "Deck 2 Tesla Reactor Airlock (2003)"; - radio_frequency = 2003 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/engineering/aft_airlock) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "nZk" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 5 @@ -31613,6 +31823,15 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) +"pae" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "paf" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 8 @@ -32734,6 +32953,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) +"pFS" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "pFU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -34348,6 +34578,21 @@ id = "AICore"; name = "AI Maintenance Blast Door" }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = -28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_ai"; + name = "airlock_horizon_deck_2_ai"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "quD" = ( @@ -34587,6 +34832,26 @@ }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) +"qyQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 23; + pixel_y = -19; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_levi"; + name = "airlock_horizon_deck_2_levi"; + frequency = 3002 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/horizon/zta) "qzF" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -37027,6 +37292,20 @@ /turf/simulated/floor/tiled, /area/operations/office) "rId" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = 28; + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_levi"; + name = "airlock_horizon_deck_2_levi"; + frequency = 3002 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/horizon/zta) "rIK" = ( @@ -37534,6 +37813,22 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/medical/ors) +"rTS" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "rTT" = ( /obj/effect/floor_decal/corner/brown{ dir = 9 @@ -39604,12 +39899,18 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "tau" = ( -/obj/effect/map_effect/airlock/s_to_n{ - name = "Deck 2 AI External Airlock (2005)"; - radio_frequency = 2005 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ + dir = 2 }, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai_upload) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "taG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -40508,6 +40809,24 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20; + pixel_x = -6 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + pixel_y = -20; + pixel_x = 6 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_indra"; + name = "airlock_horizon_deck_2_aft_indra"; + frequency = 2003 + }, /turf/simulated/floor/plating, /area/engineering/aft_airlock) "tzc" = ( @@ -40995,6 +41314,22 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) +"tHO" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "tHV" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 6 @@ -41488,6 +41823,23 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/grauwolf) +"tTg" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_indra"; + name = "airlock_horizon_deck_2_aft_indra"; + frequency = 2003 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/engineering/aft_airlock) "tTF" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 6 @@ -42542,6 +42894,23 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/aft) +"upv" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = 28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_starboard_aft"; + name = "airlock_horizon_deck_2_starboard_aft"; + frequency = 2001 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "upE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -47150,6 +47519,27 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) +"wuC" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + pixel_y = -20; + pixel_x = 7 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20; + pixel_x = -7 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_levi"; + name = "airlock_horizon_deck_2_levi"; + frequency = 3002 + }, +/turf/simulated/floor/plating, +/area/horizon/zta) "wuJ" = ( /obj/machinery/light, /obj/effect/floor_decal/corner_wide/green{ @@ -48487,6 +48877,23 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "wZJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_indra"; + name = "airlock_horizon_deck_2_aft_indra"; + frequency = 2003 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 20; + dir = 2 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/engineering/aft_airlock) "wZK" = ( @@ -50453,6 +50860,23 @@ }, /turf/simulated/floor/lino, /area/horizon/crew_quarters/lounge/bar) +"xTr" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = 28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_2_aft_sm"; + name = "airlock_horizon_deck_2_aft_sm"; + frequency = 2005 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "xUK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -62361,7 +62785,7 @@ ojK oxb gGB gGB -cww +gGB oIL oIL oIL @@ -62562,7 +62986,7 @@ oKP oKP gGB byZ -oXY +kNH gGB vNI fsf @@ -62762,10 +63186,10 @@ tsk fDE fDE pep -oXY -oXY -oXY -oXY +upv +pFS +pae +eOK tPV fsf pKB @@ -62965,8 +63389,8 @@ woY oKP oKP gGB -oXY -oXY +tHO +duG gGB eRC tPV @@ -64164,7 +64588,7 @@ bxp wcr wcr wcr -mqE +wcr wcr noU iEu @@ -64363,10 +64787,10 @@ gmo xPj oSQ bxp -sSY -sSY +eKj +nZj aVo -sSY +tau vDc cZw xPd @@ -64565,10 +64989,10 @@ gmo gmo xPj bxp -sSY -sSY -sSY -auc +xTr +cww +bkb +rTS dKS cZw kzl @@ -72846,8 +73270,8 @@ bBO bBO bBO bBO -wZJ -nZj +tTg +bBO bBO bBO bBO @@ -79118,7 +79542,7 @@ kxt kxt dGd mBB -tau +mBB mBB mBB wrW @@ -84408,7 +84832,7 @@ wNQ yka yka yka -bDn +tVu kmx qgN qgN @@ -84809,10 +85233,10 @@ rqq rqq pcJ rqq -lPd -lPd -lPd -lPd +cSv +bDn +cxn +bbl nJQ nJQ nJQ @@ -85012,8 +85436,8 @@ aPN qMW aPN yka -lPd -lPd +ffh +mqE tVu fmk fmk @@ -85021,7 +85445,7 @@ fmk fmk fmk rId -eOK +fmk fmk kuh fdj @@ -85222,7 +85646,7 @@ aPN aPN itS xzQ -rId +wuC aPN fmk kuh @@ -85424,7 +85848,7 @@ dUR aPN aPN aPN -rId +qyQ aPN fmk kuh diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 92ee6440fd8..9559ceebc4d 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -677,6 +677,15 @@ }, /turf/simulated/floor/wood, /area/horizon/cafeteria) +"avm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/turf/simulated/floor, +/area/maintenance/bridge) "avR" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, @@ -1352,6 +1361,17 @@ }, /turf/simulated/floor, /area/maintenance/security_starboard) +"aXd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/turf/simulated/floor, +/area/maintenance/bridge) "aXo" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -4251,12 +4271,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "dCv" = ( -/obj/effect/map_effect/airlock/s_to_n/long/square/wide{ - name = "Deck 2 Starboard Aft Maintenance Airlock (2001)"; - radio_frequency = 2001 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/maintenance/deck_three/aft/starboard) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/turf/simulated/floor, +/area/maintenance/bridge) "dCR" = ( /obj/structure/table/steel, /obj/item/stock_parts/subspace/amplifier, @@ -6694,6 +6718,18 @@ /obj/machinery/light/small/emergency, /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) +"fsY" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "ftz" = ( /obj/item/storage/photo_album, /obj/item/device/camera_film, @@ -8225,6 +8261,21 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) +"gwp" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/turf/simulated/floor, +/area/maintenance/bridge) "gxt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9372,7 +9423,16 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation) "hmL" = ( -/turf/simulated/floor/reinforced/airless, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "hmP" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -11898,7 +11958,12 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "jlN" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -14638,6 +14703,23 @@ /obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury/foyer) +"liU" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "ljj" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -17976,6 +18058,24 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) +"nGd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor, +/area/maintenance/bridge) "nGE" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21231,6 +21331,22 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/bridge/minibar) +"qsI" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor, +/area/maintenance/bridge) "qub" = ( /obj/structure/lattice, /obj/structure/railing/mapped, @@ -21555,6 +21671,16 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = 0; + pixel_x = -20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, /turf/simulated/floor, /area/maintenance/bridge) "qIl" = ( @@ -24455,6 +24581,22 @@ }, /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_three/aft/starboard) +"sOT" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "sPe" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -24546,6 +24688,22 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/washroom) +"sRP" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + pixel_y = 0; + pixel_x = -20 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "sSi" = ( /obj/structure/table/standard, /obj/item/paper_bin{ @@ -27101,11 +27259,15 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "uPJ" = ( -/obj/effect/map_effect/airlock/long/square/wide{ - name = "Deck 3 Starboard Maintenance Airlock (3002)"; - radio_frequency = 3002 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_fore_starboard_1"; + name = "airlock_horizon_deck_3_fore_starboard_1"; + frequency = 1002 + }, +/turf/simulated/floor, /area/maintenance/bridge) "uPO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -30635,6 +30797,15 @@ /obj/effect/shuttle_landmark/horizon/exterior/deck_3/portaft, /turf/template_noop, /area/template_noop) +"xtq" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "xuf" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 @@ -30795,6 +30966,24 @@ /obj/machinery/vending/cola, /turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) +"xAB" = ( +/obj/machinery/door/airlock/external{ + dir = 2 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 0; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_horizon_deck_3_aft_1"; + name = "airlock_horizon_deck_3_aft_1"; + frequency = 1001 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_three/aft/starboard) "xAE" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -47705,7 +47894,7 @@ wGH oXs oXs oXs -dCv +oXs uJY dED pAw @@ -47906,7 +48095,7 @@ wGH wGH oXs jlK -hmL +sRP oXs aQZ bYI @@ -47956,7 +48145,7 @@ vaL vaL vaL vaL -uPJ +ivg wGH vkb iqb @@ -48106,10 +48295,10 @@ wGH wGH muk vcD +liU hmL -hmL -hmL -hmL +xtq +xAB qDU nHY pAw @@ -48157,7 +48346,7 @@ eGw aoA vaL qHx -aoA +uPJ ivg wGH vkb @@ -48309,8 +48498,8 @@ wGH wGH wGH oXs -hmL -hmL +sOT +fsY oXs mxO hxX @@ -48357,10 +48546,10 @@ gRw jFW gmN lUC -aoA -aoA -aoA -aoA +nGd +aXd +avm +qsI wGH vBY otI @@ -48560,8 +48749,8 @@ tSR sly jvH vaL -aoA -aoA +gwp +dCv ivg wGH wGH