diff --git a/_maps/sccv_horizon.dm b/_maps/sccv_horizon.dm new file mode 100644 index 00000000000..8e74420ac07 --- /dev/null +++ b/_maps/sccv_horizon.dm @@ -0,0 +1 @@ +#define DEFAULT_MAP "sccv_horizon" \ No newline at end of file diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index f049c6c0238..1da6891512a 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -190,9 +190,9 @@ alpha = 255 switch(dir) - if(SOUTH || NORTH) + if(SOUTH, NORTH) initialize_directions = SOUTH|NORTH - if(EAST || WEST) + if(EAST, WEST) initialize_directions = EAST|WEST if(NORTHEAST) initialize_directions = NORTH|EAST diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm index d8c4b773aa1..eb7c4a0c804 100644 --- a/code/controllers/subsystems/evacuation/evacuation_pods.dm +++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm @@ -8,8 +8,8 @@ /datum/evacuation_controller/starship name = "escape pod controller" - transfer_prep_additional_delay = 5 MINUTES - autotransfer_prep_additional_delay = 5 MINUTES + transfer_prep_additional_delay = 0 MINUTES + autotransfer_prep_additional_delay = 0 MINUTES emergency_prep_additional_delay = 0 MINUTES evacuation_options = list( diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 6b6ffcbf833..00dadd2e7bd 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -72,6 +72,8 @@ var/boot_time = 35 var/next_on var/blockage + var/exhaust_offset = 1 // for engines that are longer + var/exhaust_width = 1 //for engines that are wider /obj/machinery/atmospherics/unary/engine/scc_ship_engine name = "ship thruster" @@ -79,6 +81,7 @@ icon_state = "engine_0" opacity = FALSE pixel_x = -64 + exhaust_offset = 3 /obj/machinery/atmospherics/unary/engine/scc_ship_engine/check_blockage() return 0 @@ -158,7 +161,9 @@ /obj/machinery/atmospherics/unary/engine/proc/check_blockage() blockage = FALSE var/exhaust_dir = reverse_direction(dir) - var/turf/A = get_step(src, exhaust_dir) + var/turf/A = get_turf(src) + for(var/i in 1 to exhaust_offset) + A = get_step(A, exhaust_dir) var/turf/B = A while(isturf(A) && !(isspace(A) || isopenspace(A))) if((B.c_airblock(A)) & AIR_BLOCKED) @@ -185,7 +190,9 @@ network.update = 1 var/exhaust_dir = reverse_direction(dir) - var/turf/T = get_step(src,exhaust_dir) + var/turf/T = get_turf(src) + for(var/i in 1 to exhaust_offset) + T = get_step(T, exhaust_dir) if(T) T.assume_air(removed) new/obj/effect/engine_exhaust(T, exhaust_dir, air_contents.check_combustability() && air_contents.temperature >= PHORON_MINIMUM_BURN_TEMPERATURE) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 60a398e2076..888cc78e61f 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -141,8 +141,3 @@ /obj/machinery/power/breakerbox/activated icon_state = "bbox_on" - - // Enabled on server startup. Used in substations to keep them in bypass mode. -/obj/machinery/power/breakerbox/activated/Initialize() - . = ..() - set_state(1) diff --git a/maps/sccv_horizon/code/sccv_horizon_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm index d1778da91e7..ce205839324 100644 --- a/maps/sccv_horizon/code/sccv_horizon_unittest.dm +++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm @@ -15,9 +15,11 @@ ,/area/supply/dock ,/area/turbolift ,/area/mine + ,/area/horizonexterior ) ut_apc_exempt_areas = list(/area/construction ,/area/medical/genetics + ,/area/horizonexterior ) ut_atmos_exempt_areas = list(/area/maintenance ,/area/storage @@ -33,4 +35,22 @@ ,/area/bridge/selfdestruct ,/area/medical/cryo ,/area/medical/patient_c + ,/area/turret_protected/ai + ,/area/engineering/engine_monitoring/tesla + ,/area/engineering/smes + ,/area/horizonexterior + ,/area/tcommsat/mainlvl_tcomms__relay + ,/area/tcommsat/mainlvl_tcomms__relay/second + ,/area/medical/surgery + ,/area/rnd/isolation_a + ,/area/rnd/isolation_b + ,/area/rnd/isolation_c ) + +/datum/unit_test/zas_area_test + name = "ZAS: Operations Bay" + area_path = /area/operations/storage + +/datum/unit_test/zas_area_test/arrival_maint + name = "ZAS: Arrival Maintenance" + area_path = /area/maintenance/arrivals diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index 6e70417c4e6..c5be95d76e5 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -1611,6 +1611,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "bwN" = ( @@ -1622,6 +1625,19 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"bxo" = ( +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "bxJ" = ( /obj/machinery/atmospherics/unary/engine/scc_ship_engine, /turf/simulated/floor/reinforced{ @@ -2106,7 +2122,7 @@ dir = 9; id = "QMLoad"; layer = 2.9; - reversed = 1 + reversed = null }, /turf/simulated/floor/plating, /area/operations/loading) @@ -2716,9 +2732,13 @@ /obj/effect/floor_decal/corner_wide/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "cAq" = ( @@ -3714,6 +3734,15 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"dxv" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/control) "dzg" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/binary/pump/high_power{ @@ -4327,17 +4356,13 @@ /obj/effect/floor_decal/corner_wide/purple{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/camera/network/research{ c_tag = "Research - Xenoarcheology 3"; dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "edO" = ( @@ -4376,6 +4401,19 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) +"eev" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/control) "eeD" = ( /obj/machinery/vending/wallmed1{ pixel_x = -1; @@ -4472,10 +4510,10 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Engineering Lower Deck" }, +/obj/structure/cable/green, /obj/structure/cable{ icon_state = "0-2" }, -/obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) "ekm" = ( @@ -4749,15 +4787,15 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid) "exw" = ( @@ -5921,7 +5959,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/airless, /area/engineering/atmos) "fpp" = ( @@ -6085,8 +6122,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "fwA" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "0-8" }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) @@ -6538,7 +6583,6 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-3" }, -/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/airless, /area/engineering/atmos) "fRj" = ( @@ -7437,6 +7481,12 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) +"gBo" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "gBw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -8636,11 +8686,23 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "hIx" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/space/dynamic, -/area/template_noop) +/obj/effect/floor_decal/corner_wide/purple{ + dir = 8 + }, +/obj/effect/floor_decal/corner_wide/purple{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenoarch_atrium) "hII" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 1 @@ -8833,6 +8895,18 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/control) +"hTd" = ( +/obj/machinery/power/apc/super{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "hTk" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/port/deck1) @@ -9220,7 +9294,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9546,6 +9620,15 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"iCI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/control) "iCX" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -10440,7 +10523,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/airless, /area/engineering/atmos) "jvF" = ( @@ -11741,9 +11823,16 @@ /turf/simulated/floor/wood, /area/shuttle/intrepid) "kEk" = ( -/obj/machinery/atmospherics/valve, -/turf/space/dynamic, -/area/template_noop) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 + }, +/area/rnd/xenoarch_atrium) "kEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -14644,6 +14733,9 @@ c_tag = "Engineering - Atmospherics Tanks 3"; dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "nkm" = ( @@ -15524,9 +15616,6 @@ /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) "oam" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/space/dynamic, /area/template_noop) "oap" = ( @@ -17514,6 +17603,12 @@ /area/rnd/xenoarch_atrium) "qbu" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "qbC" = ( @@ -20374,18 +20469,14 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) "sFA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hangar/operations) +/turf/simulated/floor/tiled/dark, +/area/rnd/xenoarch_atrium) "sHa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -20694,12 +20785,6 @@ "sTw" = ( /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) -"sTX" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/space/dynamic, -/area/template_noop) "sUS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -21373,15 +21458,15 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid) "tEc" = ( @@ -22047,9 +22132,6 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/effect/floor_decal/corner_wide/purple/full{ dir = 1 }, @@ -22678,7 +22760,6 @@ dir = 1 }, /obj/structure/tank_wall/carbon_dioxide, -/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/airless, /area/engineering/atmos) "uKW" = ( @@ -23189,6 +23270,9 @@ c_tag = "Engineering - Atmospherics Tanks 5"; dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "vjl" = ( @@ -23894,22 +23978,15 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "vSF" = ( -/obj/effect/floor_decal/corner_wide/purple{ - dir = 8 - }, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 8 + }, /area/rnd/xenoarch_atrium) "vSS" = ( /obj/machinery/light{ @@ -24363,7 +24440,6 @@ /obj/structure/tank_wall/phoron{ icon_state = "ph3" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/airless, /area/engineering/atmos) "wnQ" = ( @@ -24926,6 +25002,12 @@ /area/template_noop) "wUz" = ( /obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "wUM" = ( @@ -25569,15 +25651,15 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid) "xpX" = ( @@ -26007,7 +26089,6 @@ dir = 1 }, /obj/structure/tank_wall/phoron, -/obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/airless, /area/engineering/atmos) "xJE" = ( @@ -43333,7 +43414,7 @@ qvl qvl lyo oOk -sFA +vTJ kVu nWF nWF @@ -45910,8 +45991,8 @@ eSV eSV eSV eSV -sTX -kEk +sPo +oam jvE lPP xHW @@ -46314,8 +46395,8 @@ eSV eSV eSV eSV -sTX -kEk +sPo +oam foN htn nnh @@ -47122,8 +47203,8 @@ eSV eSV eSV eSV +sPo oam -kEk xJv ebN sEE @@ -47526,8 +47607,8 @@ eSV eSV eSV eSV +sPo oam -kEk wnz bGf enn @@ -48334,8 +48415,8 @@ eSV eSV eSV eSV -hIx -kEk +sPo +oam uKu vuB jpI @@ -48738,8 +48819,8 @@ eSV eSV eSV eSV -hIx -kEk +sPo +oam fQZ wdX onN @@ -49597,7 +49678,7 @@ lKY cBF aWP vai -ttK +dxv ttK hTa vJe @@ -49799,7 +49880,7 @@ tYN qgi gnn pYu -tKi +eev tKi tKi fZX @@ -49961,7 +50042,7 @@ bZU oWe twQ fnL -lIE +bxo bvb lIE coo @@ -50001,7 +50082,7 @@ xgP weO aWP rEl -aUg +iCI aUg wSd vcp @@ -50163,7 +50244,7 @@ mDH nrY itD uVL -lUr +gBo aom lUr bZp @@ -51379,7 +51460,7 @@ lUr lUr qJg lUr -lUr +hTd viX bvN uEJ @@ -53419,8 +53500,8 @@ cWo tlU tlU pau -vSF pau +hIx tlU tlU tLq @@ -53622,7 +53703,7 @@ qbk lBH qYo wAk -wAk +kEk wVW uPk nwQ @@ -53824,7 +53905,7 @@ uyc kFL jrJ jrJ -jrJ +sFA jrJ hSX mwu @@ -54430,7 +54511,7 @@ hGT jrJ jrJ jrJ -jrJ +sFA jrJ jrJ hfA @@ -54632,7 +54713,7 @@ lrC hVe ufi wtV -wtV +vSF jGW nkm sad diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index 1efd1d5f511..9175b170088 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -616,6 +616,14 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lobby) +"aqo" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring/tesla) "aqT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1437,6 +1445,8 @@ req_one_access = list(11,24) }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/engineering/smes/tesla) "aQp" = ( @@ -1787,6 +1797,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "aXX" = ( @@ -2159,6 +2172,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, +/obj/item/storage/bag/inflatable, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "biZ" = ( @@ -2624,6 +2638,12 @@ c_tag = "Research - Telescience"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/carpet/rubber, /area/rnd/telesci) "bzh" = ( @@ -2987,6 +3007,9 @@ /obj/item/modular_computer/console/preset/engineering{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) "bNd" = ( @@ -3252,6 +3275,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/turret_protected/ai_upload) "bTy" = ( @@ -3701,15 +3727,6 @@ }, /turf/simulated/floor/tiled, /area/security/checkpoint2) -"chw" = ( -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_room) "chz" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5 @@ -3909,6 +3926,9 @@ /obj/machinery/computer/cryopod/robot{ pixel_y = 32 }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai_upload) "cpl" = ( @@ -4146,6 +4166,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/research) "cAs" = ( @@ -4864,8 +4886,8 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/cable/orange{ + icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) @@ -5792,6 +5814,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "dFG" = ( @@ -6252,9 +6277,13 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "dWk" = ( @@ -6807,6 +6836,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) +"eqK" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/tiled/white, +/area/medical/or2) "eqR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, @@ -6875,6 +6911,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28; + req_one_access = list(24,11,55) + }, /turf/simulated/floor/tiled/white, /area/medical/or1) "eui" = ( @@ -7092,6 +7133,9 @@ name = "AI core maintenance hatch"; opacity = 0 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai) "eAw" = ( @@ -7146,6 +7190,9 @@ req_access = list(47) }, /obj/machinery/door/firedoor/multi_tile, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "eBy" = ( @@ -7461,6 +7508,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/brig/processing) +"eOs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring/tesla) "ePb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -8754,11 +8807,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "fEI" = ( -/obj/structure/table/standard, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Garden"; dir = 8 }, +/obj/structure/sink/kitchen{ + dir = 8; + name = "sink"; + pixel_x = 20 + }, /turf/simulated/floor/wood, /area/hydroponics/garden) "fEO" = ( @@ -9023,6 +9080,10 @@ pixel_y = 32 }, /obj/structure/railing/mapped, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "fLu" = ( @@ -9387,6 +9448,16 @@ }, /turf/simulated/floor/grass/alt, /area/hydroponics) +"fWp" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1; + external_pressure_bound = 102; + external_pressure_bound_default = 102; + icon_state = "map_vent_in"; + pump_direction = 0 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring/tesla) "fWw" = ( /obj/machinery/power/breakerbox{ RCon_tag = "Tesla Grid Bypass" @@ -9420,9 +9491,6 @@ /area/security/armory) "fZk" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -9474,6 +9542,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "fZV" = ( @@ -10094,6 +10164,7 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard) "gsh" = ( @@ -10294,6 +10365,10 @@ /area/crew_quarters/bar) "gwP" = ( /obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/engineering/engine_waste) "gwY" = ( @@ -11728,6 +11803,12 @@ }, /turf/simulated/floor/plating, /area/rnd/hallway) +"hqC" = ( +/obj/structure/table/rack, +/obj/random/loot, +/obj/item/storage/bag/inflatable, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "hrf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12204,7 +12285,7 @@ "hEs" = ( /obj/structure/lattice, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/simulated/open, /area/turret_protected/ai) @@ -12330,9 +12411,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical) "hHM" = ( -/obj/structure/ladder/up{ - pixel_y = 13 - }, +/obj/structure/ladder, /turf/simulated/open, /area/turret_protected/ai) "hHV" = ( @@ -12367,6 +12446,7 @@ dir = 5 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/maintenance/aux_atmospherics/deck_2/starboard) "hIV" = ( @@ -12561,6 +12641,9 @@ /obj/machinery/camera/network/command{ c_tag = "AI Core - Second Deck Airlock" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai) "hSp" = ( @@ -12714,6 +12797,9 @@ /turf/simulated/floor/plating, /area/engineering/engine_waste) "hYk" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai) "hYo" = ( @@ -13080,6 +13166,9 @@ /area/engineering/engine_room) "ikB" = ( /obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/carpet/rubber, /area/rnd/telesci) "ikT" = ( @@ -13339,6 +13428,15 @@ "iwo" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology) +"iwu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/engineering/smes/tesla) "iwC" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 8 @@ -13557,18 +13655,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "iEd" = ( -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/or2) "iEi" = ( @@ -13667,6 +13768,12 @@ }, /turf/simulated/floor/plating, /area/hallway/engineering) +"iHq" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/engineering/smes/tesla) "iHH" = ( /obj/structure/cable{ icon_state = "1-4" @@ -13853,6 +13960,8 @@ name = "Telescience"; req_access = list(7) }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/rubber, /area/rnd/telesci) "iLD" = ( @@ -14819,6 +14928,11 @@ /obj/item/pipewrench, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) +"jnV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark, +/area/engineering/aft_airlock) "jow" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -15185,6 +15299,12 @@ pixel_x = 6; pixel_y = -25 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/carpet/rubber, /area/rnd/telesci) "jBj" = ( @@ -15943,6 +16063,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai_upload) "kat" = ( @@ -16085,6 +16208,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "kep" = ( @@ -16123,9 +16249,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "kgj" = ( -/obj/structure/cable/green{ - icon_state = "12-0" - }, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "HoS Windows" }, @@ -17285,6 +17408,21 @@ dir = 8 }, /area/maintenance/wing/port/far) +"kZr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "kZv" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -17357,6 +17495,10 @@ /obj/item/device/radio/headset/headset_service, /turf/simulated/floor/carpet, /area/library) +"lbf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/engineering/aft_airlock) "lbv" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/mauve{ @@ -17808,6 +17950,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"lrD" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/super/critical{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "lrQ" = ( /obj/machinery/light/small/red{ dir = 4 @@ -17938,7 +18091,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/structure/cable/orange{ - icon_state = "1-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) @@ -18172,6 +18325,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"lER" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_waste) "lES" = ( /obj/effect/floor_decal/corner/blue{ dir = 4 @@ -18207,6 +18367,15 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) "lGm" = ( @@ -18308,9 +18477,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo/living_quarters_lift) "lJp" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -18866,6 +19032,9 @@ /obj/machinery/camera/network/command{ c_tag = "AI Core - Main Core" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "lYV" = ( @@ -19111,10 +19280,8 @@ /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "HoS Windows" }, -/obj/structure/cable/green{ - icon_state = "12-0" - }, /obj/machinery/door/firedoor, +/obj/structure/cable/green, /turf/simulated/floor, /area/crew_quarters/heads/hos) "mgg" = ( @@ -19316,9 +19483,6 @@ /turf/simulated/floor/tiled, /area/operations/mail_room) "mlD" = ( -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -19328,6 +19492,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/or1) "mmS" = ( @@ -20230,10 +20397,22 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) +"mPh" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "mPl" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/crew_quarters/kitchen) @@ -20377,6 +20556,12 @@ }, /turf/simulated/floor/carpet/rubber, /area/crew_quarters/heads/hor) +"mUe" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "mUy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -21460,9 +21645,10 @@ /obj/structure/window/phoronreinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engineering/engine_room) "nzn" = ( @@ -21757,6 +21943,11 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/aft) +"nHY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/engineering/aft_airlock) "nIi" = ( /turf/simulated/wall, /area/hallway/medical) @@ -23891,6 +24082,8 @@ req_one_access = list(11,24) }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "pbS" = ( @@ -24585,6 +24778,17 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) +"pBi" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "HoS Windows" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/hos) "pBn" = ( /obj/effect/floor_decal/corner/mauve{ dir = 4 @@ -24935,6 +25139,12 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/engineering/engine_waste) "pLI" = ( @@ -25077,6 +25287,13 @@ dir = 4 }, /area/hallway/primary/central_two) +"pOV" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring/tesla) "pPM" = ( /obj/structure/table/standard, /obj/item/storage/box/syringes{ @@ -25459,6 +25676,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/lobby) +"qao" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "qar" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -25512,6 +25733,9 @@ /area/maintenance/wing/starboard) "qcc" = ( /obj/structure/railing/mapped, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, /turf/simulated/floor/reinforced, /area/turret_protected/ai_upload) "qcs" = ( @@ -25814,6 +26038,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "qqs" = ( @@ -26199,6 +26426,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "qBt" = ( @@ -26520,8 +26750,15 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "qMd" = ( -/turf/simulated/wall/r_wall, -/area/assembly/robotics/workshop) +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/hallway/engineering/tesla) "qMJ" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-6-f" @@ -27173,23 +27410,15 @@ /turf/simulated/floor/tiled, /area/security/brig) "rfG" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/lattice, +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access = list(16) +/obj/structure/cable/orange{ + icon_state = "1-4" }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "AICore"; - name = "AI core maintenance hatch"; - opacity = 0 - }, -/turf/simulated/floor/tiled/dark, -/area/turret_protected/ai_upload_foyer) +/turf/simulated/open, +/area/turret_protected/ai) "rfO" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/watertank, @@ -27223,9 +27452,7 @@ /turf/simulated/floor/tiled, /area/engineering/smes) "rgF" = ( -/obj/structure/ladder{ - pixel_y = 16 - }, +/obj/structure/ladder/up, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) "rgH" = ( @@ -27355,6 +27582,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/engine_waste) "rlj" = ( @@ -27378,12 +27608,10 @@ dir = 10 }, /obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/research) "rls" = ( @@ -27547,6 +27775,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/research) "rpj" = ( @@ -28038,6 +28267,12 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/rnd/conference) +"rDw" = ( +/obj/structure/closet/crate, +/obj/random/loot, +/obj/item/storage/bag/inflatable, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "rDH" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm{ @@ -28133,6 +28368,9 @@ "rGU" = ( /obj/effect/map_effect/wingrille_spawn/reinforced_phoron, /obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/engineering/engine_monitoring/tesla) "rGX" = ( @@ -28455,6 +28693,24 @@ dir = 8 }, /area/maintenance/wing/port/far) +"rPY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "EngineEmitterPortWest"; + layer = 3.3; + name = "Engine Waste Handling Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_waste) "rQf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29251,7 +29507,7 @@ pixel_y = 25 }, /obj/structure/cable/orange{ - icon_state = "2-4" + icon_state = "4-8" }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -29378,6 +29634,13 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "svf" = ( @@ -29695,7 +29958,7 @@ pixel_y = 24 }, /obj/structure/cable/orange{ - icon_state = "0-2" + icon_state = "0-8" }, /turf/simulated/floor/reinforced, /area/turret_protected/ai_upload) @@ -30918,13 +31181,13 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "txc" = ( @@ -30987,8 +31250,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/turret_protected/ai_upload_foyer) +/turf/simulated/floor/tiled/ramp, +/area/turret_protected/ai_upload) "tzf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_atmos{ @@ -31108,6 +31371,9 @@ "tCP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/turret_protected/ai_upload) "tDc" = ( @@ -31477,7 +31743,7 @@ dir = 4 }, /obj/structure/cable/orange{ - icon_state = "1-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) @@ -31864,9 +32130,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/research) "tYB" = ( @@ -32457,22 +32724,16 @@ /turf/simulated/open/airless, /area/horizonexterior) "upm" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, /obj/machinery/door/blast/regular{ - density = 0; dir = 4; - icon_state = "pdoor0"; - id = "AICore"; - name = "AI core maintenance hatch"; - opacity = 0 + id = "ai_upload"; + name = "AI Upload Blast Doors" }, -/obj/machinery/door/firedoor, -/obj/structure/cable/orange{ +/obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/turret_protected/ai) +/turf/simulated/floor/tiled, +/area/turret_protected/ai_upload) "upn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32713,6 +32974,17 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora_hazard) +"uvM" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "uwe" = ( /obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ @@ -32846,6 +33118,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/reinforced, /area/engineering/storage/tech) +"uzy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "uzL" = ( /obj/structure/table/standard, /obj/item/modular_computer/laptop/preset/command/teleporter, @@ -32928,6 +33206,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/conference) "uDs" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "uEg" = ( @@ -33681,6 +33962,8 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "uZD" = ( @@ -33769,9 +34052,6 @@ /turf/simulated/floor/tiled/dark/airless, /area/maintenance/wing/starboard) "vdy" = ( -/obj/structure/cable/green{ - icon_state = "12-0" - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "HoS Windows" @@ -33779,6 +34059,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) "vdQ" = ( @@ -34275,6 +34556,19 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/far) +"vvh" = ( +/obj/structure/railing/mapped, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "vvS" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -34341,7 +34635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/open, /area/maintenance/wing/starboard) "vxK" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -34737,6 +35031,9 @@ /obj/effect/landmark/start{ name = "Cyborg" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "vJK" = ( @@ -34997,6 +35294,13 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "vQs" = ( @@ -35435,6 +35739,12 @@ req_one_access = list(11,24) }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/smes/tesla) "vZx" = ( @@ -35465,7 +35775,7 @@ /area/maintenance/wing/starboard/far) "vZJ" = ( /obj/structure/table/standard, -/obj/structure/closet/crate/hydroponics, +/obj/structure/closet/crate/hydroponics/prespawned, /turf/simulated/floor/wood, /area/hydroponics/garden) "vZY" = ( @@ -35750,8 +36060,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plating, /area/hallway/engineering/tesla) @@ -36158,6 +36471,18 @@ }, /turf/simulated/floor/reinforced, /area/engineering/storage/tech) +"wsL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/engineering/engine_room/tesla) "wsV" = ( /obj/structure/table/rack{ dir = 8; @@ -37030,6 +37355,15 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) +"wQS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring/tesla) "wRd" = ( /obj/item/modular_computer/console/preset/security{ dir = 8 @@ -37079,6 +37413,7 @@ /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, /obj/machinery/firealarm/west, +/obj/item/storage/bag/inflatable, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "wSE" = ( @@ -37361,9 +37696,6 @@ pixel_x = 28; req_one_access = list(24,11,55) }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/ramp, /area/turret_protected/ai_upload) "xcK" = ( @@ -38013,6 +38345,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/rnd/research) "xxw" = ( @@ -38032,10 +38366,10 @@ pixel_y = 24 }, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "0-4" }, /obj/structure/cable/orange{ - icon_state = "0-4" + icon_state = "0-8" }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -38714,16 +39048,11 @@ /turf/simulated/floor/tiled, /area/security/brig) "xVz" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plating, -/area/security/prison) +/area/engineering/engine_waste) "xVB" = ( /obj/structure/railing/mapped{ dir = 4 @@ -38891,10 +39220,10 @@ /obj/structure/window/phoronreinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "yay" = ( @@ -39038,6 +39367,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "ycL" = ( @@ -47384,7 +47719,7 @@ qxy pEt pBB gyu -rYx +rDw sfk whe qgN @@ -51597,7 +51932,7 @@ fxw bKd hGX vVv -vVv +hqC fdF bwR apd @@ -54630,7 +54965,7 @@ wrA xbv oTE laB -lpB +vvh fsf wxr quV @@ -55441,7 +55776,7 @@ ibx jvV fsf oGm -fai +eqK tpy cVe hQa @@ -56223,7 +56558,7 @@ mWY mWY ycD nzf -chw +nzf yag ndD tlh @@ -56423,7 +56758,7 @@ wcr wcr sNe xGT -oJM +kZr gON gON fQa @@ -56625,7 +56960,7 @@ tNa tNa gsz gsz -jfp +rPY xQp xQp gsz @@ -56825,7 +57160,7 @@ rMw rrN tNa tNa -ily +xVz gwP pLA gXu @@ -57028,7 +57363,7 @@ oSQ tNa tNa rlf -gwP +lER erh jgZ lCV @@ -59259,7 +59594,7 @@ qjS rwy ydI lMD -mtf +qMd whx vxY ftj @@ -62083,11 +62418,11 @@ mzh mzh cQS dcX -rLn -rLn -rLn +lbf +jnV +nHY aQc -bTg +iHq twC dVN xHd @@ -62487,9 +62822,9 @@ jKV jKV tZr hax +mUe hMt -hMt -hMt +lrD wfD fWw cKB @@ -62688,14 +63023,14 @@ hMt hMt hMt ddA -hMt -vTu -iIB -iIB +qao +uvM +mPh +wsL pbN fZI uZt -vQl +iwu xvZ wfD uxE @@ -62893,7 +63228,7 @@ iFp hMt uGp hMt -hMt +uzy wfD wfD wfD @@ -63095,7 +63430,7 @@ eQw iIB gqP hMt -tiJ +aqo rGU bLB bLB @@ -63144,8 +63479,8 @@ efA kgj mPc vdy -kgj -kgj +pBi +pBi mfX vsS sGm @@ -63301,8 +63636,8 @@ tiJ qdq tPU tPU -ecV -ecV +wQS +fWp uEq uxE bGh @@ -63503,8 +63838,8 @@ dAw ecV ecV ecV -ecV -uQQ +eOs +pOV uEq uxE bGh @@ -63955,7 +64290,7 @@ kkW aaa gDR jAp -xVz +fQA nFf gDR lKN @@ -64138,7 +64473,7 @@ uTr uTr uTr uTr -qMd +vyd vyd vyd xSO @@ -64524,8 +64859,8 @@ qcc uXX vJw uDs -pEu -obZ +tyZ +upm bTo tCP aXf @@ -65326,8 +65661,8 @@ iXI jSY qnb ool -qnb -ool +hEs +rfG qnb iXI xdu @@ -65732,8 +66067,8 @@ hHM iXI wLz spR -hEs -upm +qnb +cyG lxN iYw cyZ @@ -65937,8 +66272,8 @@ xxw mQe mHH cZT -tyZ -rfG +gfN +cyZ lJp fZk xFR diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index 41626c3d9ac..e094f5635f5 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -775,6 +775,7 @@ "bH" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "bI" = ( @@ -1395,6 +1396,22 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) +"de" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "df" = ( /obj/structure/cable{ icon_state = "0-2" @@ -2844,10 +2861,20 @@ "gx" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/crew_quarters/captain) "gy" = ( /obj/machinery/atmospherics/unary/freezer{ + dir = 8; icon_state = "freezer_1"; set_temperature = 73; use_power = 1 @@ -3321,6 +3348,25 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"hC" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "hE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3407,6 +3453,18 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) +"hQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/locker) "hR" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -3455,7 +3513,7 @@ "hV" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 + dir = 9 }, /turf/simulated/floor, /area/tcommsat/entrance) @@ -3522,9 +3580,6 @@ name = "Security - Investigations Office" }) "ib" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -3534,6 +3589,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "ic" = ( @@ -5303,6 +5359,14 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/machinery/requests_console{ + department = "Bridge"; + pixel_y = 32 + }, +/obj/item/device/radio/intercom/department{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/carpet/rubber, /area/bridge) "mw" = ( @@ -6902,6 +6966,25 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"qb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/maintenance/bridge) "qc" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 10 @@ -7092,6 +7175,7 @@ "qy" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "qB" = ( @@ -7633,6 +7717,7 @@ /obj/effect/landmark{ name = "JoinLateCryo" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "rL" = ( @@ -9587,6 +9672,19 @@ /obj/structure/closet/secure_closet/xo, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) +"wU" = ( +/obj/structure/railing/mapped, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/low{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/maintenance/bridge) "wV" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, @@ -9903,6 +10001,10 @@ name = "Station Intercom (General)"; pixel_y = -24 }, +/obj/machinery/disposal/small/north, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "xL" = ( @@ -10134,6 +10236,15 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) +"yq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/locker) "yr" = ( /obj/machinery/firealarm/west, /turf/simulated/floor/wood, @@ -13114,6 +13225,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) +"Gq" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/carpet/rubber, +/area/bridge) "Gr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -14258,6 +14373,16 @@ }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) +"IV" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1; + external_pressure_bound = 102; + external_pressure_bound_default = 102; + icon_state = "map_vent_in"; + pump_direction = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/locker) "IW" = ( /obj/machinery/requests_console{ department = "Engineering"; @@ -14543,11 +14668,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "JC" = ( -/obj/structure/table/rack, -/obj/random/arcade, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_3) "JD" = ( @@ -15100,6 +15224,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "KW" = ( @@ -15559,6 +15684,16 @@ }, /turf/simulated/open, /area/hallway/primary/starboard) +"LW" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "LY" = ( /obj/structure/railing/mapped{ dir = 1 @@ -15840,6 +15975,7 @@ /obj/effect/landmark{ name = "JoinLate" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "MJ" = ( @@ -17044,6 +17180,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/item/storage/bag/inflatable, /turf/simulated/floor, /area/maintenance/aux_atmospherics/deck_3) "Pw" = ( @@ -17648,7 +17785,6 @@ "QI" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, -/obj/machinery/door/firedoor, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/aux_atmospherics/deck_3) "QJ" = ( @@ -17905,6 +18041,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) +"Ru" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) "Rv" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -18469,6 +18610,7 @@ /obj/machinery/door/firedoor/multi_tile{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "SX" = ( @@ -19166,6 +19308,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/random/soap, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "UJ" = ( @@ -19369,10 +19512,10 @@ /area/security/vacantoffice2) "Vl" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/light/small/emergency, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/engineering_ladder) "Vm" = ( @@ -19710,6 +19853,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/random/soap, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "We" = ( @@ -36945,8 +37089,8 @@ CX km Um nZ -DW -Ny +hQ +IV Ny Ny Ec @@ -37151,7 +37295,7 @@ DW yz yz yz -Ec +yq Da eX jM @@ -39581,10 +39725,10 @@ Ye Ye Ye co -Lg -iY +de +LW SW -sT +Ru qy bH KU @@ -40004,8 +40148,8 @@ dg mY SK cq -pl -yV +wU +qb VC VC VC @@ -41644,7 +41788,7 @@ SH Fn US Xe -Oo +Gq AQ Hg FQ @@ -43802,7 +43946,7 @@ at at at em -Fq +EG DQ DQ DQ @@ -44004,7 +44148,7 @@ at at at aK -Fq +EG DQ EZ oG @@ -44206,7 +44350,7 @@ at at at aK -Fq +EG DQ Nf Bs @@ -44408,7 +44552,7 @@ at at at aK -Fq +EG DQ Nd Xr @@ -44423,7 +44567,7 @@ Fr Ss Sj ck -Sj +hC fi hg Sj @@ -44610,7 +44754,7 @@ at at at em -Fq +EG DQ Rb CR @@ -44812,7 +44956,7 @@ at at at em -Fq +EG DQ Fx CR @@ -45216,7 +45360,7 @@ at at at em -Fq +EG DQ CJ CR @@ -45418,7 +45562,7 @@ at at at em -Fq +EG DQ DQ DQ