From 97a503acb918b40b2e580a8a065f801e349ee7b8 Mon Sep 17 00:00:00 2001 From: Joshie Date: Fri, 4 Oct 2024 13:09:58 +1000 Subject: [PATCH 1/6] Pt 1 --- .../dominian_science_vessel.dmm | 1185 ++++++++++------- 1 file changed, 695 insertions(+), 490 deletions(-) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index b6cb0e24a28..efa35e34a53 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -5,12 +5,6 @@ /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) -"aaJ" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, -/obj/machinery/door/firedoor/noid, -/turf/simulated/floor/plating, -/area/shuttle/dominian_science_shuttle) "ada" = ( /obj/effect/floor_decal/corner/purple/full, /obj/structure/window/reinforced{ @@ -39,13 +33,6 @@ }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) -"ajL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/template_noop, -/area/ship/dominian_science_vessel/exterior) "akl" = ( /obj/structure/ship_weapon_dummy, /turf/template_noop, @@ -61,18 +48,9 @@ /obj/machinery/access_button{ pixel_x = 28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) -"amZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/turf/simulated/floor/plating, -/area/ship/dominian_science_vessel/aft_dock) "ans" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/table/rack, @@ -98,7 +76,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "aqS" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -149,7 +128,9 @@ dir = 8; name = "starboard, storage" }, -/turf/simulated/wall/shuttle, +/obj/machinery/door/firedoor/noid, +/obj/effect/map_effect/window_spawner/full/shuttle, +/turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "atj" = ( /obj/structure/cable{ @@ -163,6 +144,12 @@ /obj/effect/floor_decal/industrial/outline/research, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) +"avG" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "axE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -291,7 +278,8 @@ dir = 4; pixel_y = -28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "aMc" = ( /obj/structure/cable/pink{ @@ -404,7 +392,8 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "bac" = ( /obj/structure/cable/pink{ @@ -439,7 +428,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "bkQ" = ( /obj/structure/cable/pink{ @@ -455,6 +445,16 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) +"bns" = ( +/obj/machinery/power/apc/south{ + req_access = list(226) + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/port_propulsion) "bon" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering" @@ -465,7 +465,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/engineering) "bos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -524,8 +525,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "brM" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/effect/landmark/entry_point/port{ name = "port, bridge" }, @@ -534,6 +533,7 @@ name = "Bridge Lockdown"; id = "bridgelock" }, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/bridge) "bvh" = ( @@ -545,21 +545,22 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "bvi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "bxu" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/effect/landmark/entry_point/port{ dir = 4; name = "port, medical" }, /obj/machinery/door/firedoor/noid, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "bzK" = ( @@ -621,7 +622,8 @@ /obj/machinery/light{ icon_state = "tube_empty" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "bSl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -638,8 +640,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/center_hall) "bTa" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/effect/landmark/entry_point/starboard{ name = "starboard, bridge" }, @@ -648,6 +648,7 @@ name = "Bridge Lockdown"; id = "bridgelock" }, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/bridge) "bTi" = ( @@ -702,6 +703,14 @@ }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) +"cod" = ( +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/door/window/northleft{ + dir = 2 + }, +/turf/simulated/floor/tiled/dark/full, +/area/ship/dominian_science_vessel/port_hall) "coi" = ( /obj/machinery/alarm/south{ req_access = list(226); @@ -745,13 +754,12 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/officer) "cuJ" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/machinery/door/firedoor/noid, /obj/machinery/door/blast/regular/open{ name = "Bridge Lockdown"; id = "bridgelock" }, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/bridge) "cwi" = ( @@ -772,11 +780,6 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/dominian_science_shuttle) -"cwv" = ( -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/aft_dock) "cxL" = ( /obj/structure/bed/stool/chair/shuttle, /obj/machinery/light{ @@ -799,6 +802,11 @@ }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"cDs" = ( +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/walllocker/emerglocker/north, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "cHM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -834,11 +842,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/power/apc/south{ - req_access = list(226) - }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) @@ -881,8 +886,8 @@ pixel_x = -8; gpstag = "SCC14" }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/device/radio/sci, +/obj/item/device/radio/sci, /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "cTq" = ( @@ -891,7 +896,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/template_noop, +/turf/space, /area/ship/dominian_science_vessel/exterior) "cTu" = ( /obj/effect/floor_decal/corner/purple/diagonal, @@ -916,10 +921,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/alarm/south{ - req_access = list(226); - req_one_access = null - }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) "cYw" = ( @@ -966,6 +967,10 @@ icon_state = "tube_empty" }, /obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/door/window/northright{ + dir = 2 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "dck" = ( @@ -1068,7 +1073,11 @@ pixel_y = 28; dir = 4 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "dol" = ( /obj/machinery/door/airlock/external{ @@ -1083,13 +1092,11 @@ pixel_y = -28; dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) -"doI" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped, -/turf/template_noop, -/area/ship/dominian_science_vessel/exterior) "doM" = ( /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/aft_dock) @@ -1312,7 +1319,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "dTD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1328,16 +1336,9 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/starboard_hall) "dWx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) -"dWZ" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/port_hall) "dZw" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -1357,6 +1358,13 @@ }, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) +"efw" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/space, +/area/space) "ekb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1425,7 +1433,7 @@ /area/shuttle/dominian_science_shuttle) "eqS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 + dir = 1 }, /obj/effect/map_effect/marker/airlock{ master_tag = "shipexterior" @@ -1435,7 +1443,8 @@ pixel_y = 6; pixel_x = 20 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "etL" = ( /turf/space/transit/north, @@ -1516,7 +1525,8 @@ name = "Ammunition Storage" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "eGa" = ( /obj/structure/closet/crate, @@ -1725,7 +1735,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/service, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/mess) "feI" = ( /obj/machinery/door/airlock/external{ @@ -1745,12 +1756,25 @@ pixel_y = 28; dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "fii" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/aft_dock) +"flo" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube_empty" + }, +/obj/machinery/atmospherics/unary/heater{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/aft_dock) "fnE" = ( /obj/structure/table/steel, /obj/item/device/binoculars, @@ -1773,7 +1797,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "foH" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -1789,7 +1814,6 @@ /area/ship/dominian_science_vessel/starboard_hall) "fpC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/meter, /obj/machinery/alarm/south{ req_access = list(226); req_one_access = null @@ -1809,6 +1833,13 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) +"fuZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/machinery/portable_atmospherics/canister/hydrogen, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/atmospherics) "fvv" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1836,7 +1867,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "fxK" = ( /obj/structure/closet/cabinet, @@ -1911,6 +1943,12 @@ }, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) +"fIw" = ( +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/port_propulsion) "fMI" = ( /obj/structure/railing/mapped{ dir = 4 @@ -1983,7 +2021,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "gcq" = ( /obj/structure/bed/stool/chair/office/bridge/pilot, @@ -2027,13 +2066,13 @@ /area/ship/dominian_science_vessel/isolation) "goU" = ( /obj/structure/table/wood, -/obj/machinery/chemical_dispenser/coffee, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/chemical_dispenser/coffee/full, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "gtV" = ( @@ -2107,11 +2146,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "gUu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "gVc" = ( @@ -2142,9 +2180,20 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) "gZq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/closet/walllocker{ + pixel_x = 32; + name = "shuttle hydrogen tanks" }, +/obj/item/tank/hydrogen, +/obj/item/tank/hydrogen, +/obj/item/tank/hydrogen, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "gZs" = ( @@ -2208,7 +2257,8 @@ pixel_x = -28; pixel_y = -28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hgc" = ( /obj/structure/table/steel, @@ -2222,7 +2272,6 @@ /area/ship/dominian_science_vessel/research) "hhf" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "shipexterior" }, @@ -2231,7 +2280,11 @@ pixel_x = -28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "hlW" = ( /obj/machinery/door/airlock/service{ @@ -2243,11 +2296,8 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/officer) "hmP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) @@ -2400,7 +2450,10 @@ pixel_y = -28; dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hHN" = ( /obj/machinery/light{ @@ -2463,14 +2516,14 @@ /obj/machinery/door/airlock/engineering{ name = "Atmospherics" }, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/atmospherics) "hMa" = ( /obj/effect/map_effect/marker/airlock/docking{ @@ -2486,7 +2539,7 @@ dir = 4; pixel_y = 6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "hOQ" = ( /obj/effect/map_effect/marker/airlock{ @@ -2501,7 +2554,11 @@ dir = 8; icon_state = "tube_empty" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hWr" = ( /obj/structure/window/reinforced{ @@ -2591,15 +2648,16 @@ master_tag = "starboardext" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, /obj/machinery/access_button{ pixel_x = 28; dir = 1; pixel_y = -19 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "iio" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -2690,9 +2748,6 @@ icon_state = "1-4" }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "ive" = ( @@ -2720,11 +2775,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) "ixH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/binary/passive_gate/on/output{ + dir = 4; + target_pressure = 300; + name = "pressure regulator" }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) @@ -2880,7 +2934,11 @@ /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ pixel_y = 26 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "jeW" = ( /obj/random/pottedplant, @@ -2898,7 +2956,7 @@ }, /obj/structure/railing/mapped, /obj/item/hullbeacon/red, -/turf/template_noop, +/turf/space, /area/ship/dominian_science_vessel/exterior) "jjy" = ( /obj/structure/cable{ @@ -2908,19 +2966,19 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "jjX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) "jkM" = ( -/obj/structure/closet/firecloset/full, /obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/walllocker/firecloset{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "jnx" = ( @@ -2967,7 +3025,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "jxb" = ( /obj/structure/cable/green{ @@ -2977,7 +3038,7 @@ req_access = list(226); req_one_access = null }, -/turf/simulated/floor/plating, +/turf/simulated/floor/greengrid, /area/ship/dominian_science_vessel/engineering) "jxr" = ( /obj/machinery/power/apc/east{ @@ -2995,13 +3056,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) -"jzp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/wall/shuttle, -/area/ship/dominian_science_vessel/atmospherics) "jDr" = ( /obj/machinery/light{ dir = 8; @@ -3043,15 +3097,18 @@ /obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) +"jOi" = ( +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "jOW" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/power/apc/north{ req_access = list(226) }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "jQE" = ( @@ -3077,6 +3134,10 @@ }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"jXJ" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) "jXM" = ( /obj/structure/window/reinforced{ name = "adjusted reinforced window" @@ -3122,21 +3183,14 @@ dir = 8; icon_state = "tube_empty" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) -"keG" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/port_hall) "kfu" = ( -/obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/light{ dir = 4 }, +/obj/machinery/pipedispenser, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "kfB" = ( @@ -3188,7 +3242,11 @@ pixel_y = 20; pixel_x = -6 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "knI" = ( /obj/structure/sign/nosmoking_1, @@ -3241,7 +3299,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "krH" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -3327,6 +3386,14 @@ "kJp" = ( /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/quarters) +"kKS" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/door/window/northright{ + dir = 2 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "kOU" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/purple/diagonal, @@ -3355,7 +3422,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "kRK" = ( /obj/effect/floor_decal/corner/purple{ @@ -3393,13 +3461,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) -"kXR" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/port_hall) "kXV" = ( /obj/effect/floor_decal/corner/yellow/full, /obj/structure/table/steel, @@ -3411,8 +3472,9 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "leu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "lfS" = ( @@ -3421,6 +3483,13 @@ }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) +"lhP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/space, +/area/space) "liI" = ( /obj/machinery/door/airlock/command{ req_access = list(226); @@ -3437,7 +3506,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/officer) "lme" = ( /obj/effect/shuttle_landmark/dominian_science_vessel/nav4, @@ -3453,9 +3522,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/binary/pump/high_power{ dir = 1 }, @@ -3484,9 +3550,8 @@ /turf/simulated/floor/carpet, /area/ship/dominian_science_vessel/officer) "lqn" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/machinery/door/firedoor/noid, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/officer) "lri" = ( @@ -3514,9 +3579,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) -"lul" = ( -/turf/simulated/floor/plating, -/area/ship/dominian_science_vessel/aft_dock) "lvo" = ( /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -3535,9 +3597,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "lwX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, /obj/effect/map_effect/marker/airlock{ master_tag = "shipexterior" }, @@ -3550,11 +3609,22 @@ dir = 8; icon_state = "tube_empty" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "lxi" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/engineering) +"lzq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/space, +/area/space) "lBn" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/officer) @@ -3590,11 +3660,8 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "lDQ" = ( -/obj/machinery/power/portgen/basic/fusion, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, +/obj/structure/reagent_dispensers/coolanttank, +/turf/simulated/floor/greengrid, /area/ship/dominian_science_vessel/engineering) "lHw" = ( /obj/effect/floor_decal/corner/green/full, @@ -3636,7 +3703,10 @@ id = "lockdown" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/research{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/research) "lUe" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -3653,6 +3723,11 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) +"maG" = ( +/obj/machinery/door/firedoor/noid, +/obj/effect/map_effect/window_spawner/full/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/dominian_science_shuttle) "maT" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -3663,7 +3738,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/engineering) "meg" = ( /turf/simulated/wall/shuttle, @@ -3677,11 +3753,13 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ pixel_y = 20 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "mit" = ( /obj/effect/landmark/entry_point/fore{ @@ -3699,14 +3777,13 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "mqx" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/machinery/door/firedoor/noid, /obj/machinery/door/blast/regular/open{ name = "Bridge Lockdown"; id = "bridgelock"; dir = 4 }, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/bridge) "mtZ" = ( @@ -3827,7 +3904,8 @@ cycle_to_external_air = 1 }, /obj/effect/map_effect/marker_helper/airlock/out, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "mLM" = ( /obj/machinery/light{ @@ -3880,13 +3958,15 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "mSJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "mUR" = ( /turf/simulated/floor/tiled/white, @@ -3904,7 +3984,10 @@ pixel_y = 28; dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "mWV" = ( /obj/machinery/light{ @@ -4203,6 +4286,14 @@ "nVP" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/research) +"oat" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/turf/space, +/area/space) "odj" = ( /obj/structure/table/steel, /obj/item/storage/belt/medical{ @@ -4309,6 +4400,18 @@ }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) +"ooL" = ( +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/walllocker/firecloset{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) +"ope" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped, +/turf/space, +/area/space) "opf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4343,7 +4446,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/marble/dark, +/obj/effect/floor_decal/industrial/hatch_door/service, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "oxg" = ( /obj/structure/ship_weapon_dummy/barrel, @@ -4411,7 +4515,8 @@ pixel_x = -28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "oDy" = ( /obj/machinery/door/airlock/command{ @@ -4425,7 +4530,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/security, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/bridge) "oEd" = ( /obj/structure/sign/vacuum, @@ -4445,7 +4551,10 @@ pixel_x = -24; pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "oGe" = ( /obj/structure/table/stone/marble, @@ -4466,7 +4575,8 @@ dir = 1 }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/security, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/bridge) "oNj" = ( /obj/machinery/sleeper, @@ -4594,7 +4704,8 @@ pixel_x = -28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "pfE" = ( /obj/structure/platform{ @@ -4618,6 +4729,10 @@ "pgn" = ( /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) +"pmy" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/space) "poc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -4654,7 +4769,8 @@ pixel_x = 28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "puI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4675,10 +4791,11 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "pxp" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/machinery/atmospherics/pipe/tank/nitrogen{ + dir = 1; + name = "Pressure Tank (Waste)"; + start_pressure = 0 }, -/obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "pyW" = ( @@ -4710,7 +4827,11 @@ pixel_x = 28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "pKo" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ @@ -4730,7 +4851,8 @@ name = "airlock_dominian_science_shuttle"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "pNy" = ( /obj/machinery/cryopod{ @@ -4813,9 +4935,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) @@ -4844,9 +4963,19 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) "qll" = ( -/obj/structure/reagent_dispensers/coolanttank, +/obj/machinery/power/portgen/basic/fusion, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/engineering) +"qmw" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/template_noop, +/area/space) "qqr" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -4940,6 +5069,11 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) +"qFu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/white, +/area/ship/dominian_science_vessel/research) "qHO" = ( /obj/structure/ship_weapon_dummy, /obj/effect/landmark/entry_point/fore{ @@ -4974,7 +5108,7 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "qKW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/atmospherics/binary/pump/on{ dir = 8 }, /turf/simulated/floor/plating, @@ -5016,6 +5150,16 @@ }, /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) +"qNB" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/space, +/area/space) "qPA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -5029,6 +5173,12 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/starboard_hall) +"qSE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "qTV" = ( /obj/machinery/light{ dir = 8; @@ -5054,15 +5204,17 @@ /obj/structure/survey_probe/dominia, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) +"raL" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/door/window/northright{ + dir = 2 + }, +/turf/simulated/floor/tiled/dark/full, +/area/ship/dominian_science_vessel/port_hall) "rex" = ( /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) -"reI" = ( -/obj/structure/closet/crate/bin{ - name = "trashbin" - }, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/aft_dock) "rfO" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/industrial/outline/firefighting_closet, @@ -5074,7 +5226,7 @@ dir = 4 }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/hangar) "ril" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, @@ -5096,10 +5248,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) "rkg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "rkM" = ( @@ -5175,15 +5325,6 @@ req_access = list(226); req_one_access = null }, -/obj/structure/closet/crate, -/obj/item/stack/material/graphite/full{ - pixel_y = 3; - pixel_x = 5 - }, -/obj/item/stack/material/graphite/full{ - pixel_y = 3; - pixel_x = 5 - }, /obj/item/stack/material/tritium/full{ pixel_y = 3; pixel_x = -5 @@ -5195,13 +5336,24 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, -/obj/item/stack/material/graphite/full{ - pixel_y = 3; - pixel_x = 5 +/obj/item/stack/material/uranium/full{ + pixel_x = 5; + pixel_y = 3 }, -/obj/item/stack/material/graphite/full{ - pixel_y = 3; - pixel_x = 5 +/obj/item/stack/material/uranium/full{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/stack/material/uranium/full{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/stack/material/uranium/full{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/closet/crate/rad{ + name = "radioactive fuel crate" }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) @@ -5375,6 +5527,9 @@ "svV" = ( /obj/machinery/atmospherics/portables_connector/aux, /obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/door/window/northleft{ + dir = 2 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "sxg" = ( @@ -5431,7 +5586,7 @@ name = "airlock_dominian_science_dock_port" }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "sFI" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -5447,7 +5602,7 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "sFQ" = ( -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide, +/obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "sGi" = ( @@ -5510,8 +5665,6 @@ /turf/simulated/floor/carpet, /area/ship/dominian_science_vessel/officer) "sOb" = ( -/obj/structure/grille, -/obj/structure/window/shuttle, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, @@ -5521,6 +5674,7 @@ id = "bridgelock"; dir = 4 }, +/obj/effect/map_effect/window_spawner/full/shuttle, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/bridge) "sTK" = ( @@ -5538,7 +5692,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/quarters) "sVI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5575,7 +5732,15 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) "tfK" = ( -/turf/simulated/wall/r_wall, +/obj/machinery/alarm/south{ + req_access = list(226); + req_one_access = null + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) "tjB" = ( /turf/simulated/wall/r_wall, @@ -5676,7 +5841,8 @@ dir = 1; pixel_y = 12 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "trF" = ( /obj/structure/table/rack{ @@ -5705,6 +5871,16 @@ /obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) +"ttP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/space, +/area/space) "ttW" = ( /obj/effect/map_effect/marker/airlock/docking{ master_tag = "airlock_dominian_science_dock_port"; @@ -5714,7 +5890,8 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "tuK" = ( /obj/effect/landmark/entry_point/fore{ @@ -5813,14 +5990,20 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "tVs" = ( -/obj/machinery/power/portgen/basic{ - anchored = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/machinery/power/portgen/basic/advanced{ + anchored = 1 + }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/engineering) +"tYP" = ( +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/walllocker/emerglocker/south, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "uaC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 @@ -5899,7 +6082,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/quarters) "urz" = ( /obj/effect/shuttle_landmark/dominian_science_vessel/nav1, @@ -5931,10 +6117,10 @@ landmark_tag = "nav_dominian_science_dock_aft"; name = "airlock_dominian_science_dock_aft" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uAj" = ( /obj/machinery/light{ @@ -6005,8 +6191,11 @@ pixel_y = 28; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "uEm" = ( /obj/machinery/light{ @@ -6047,7 +6236,13 @@ dir = 2; pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uJi" = ( /obj/machinery/computer/ship/sensors, @@ -6086,7 +6281,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) "uWe" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, /turf/simulated/floor/plating, @@ -6108,12 +6304,16 @@ /area/ship/dominian_science_vessel/aft_dock) "uZo" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-8" + }, +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 16 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "2-8"; + dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/greengrid, /area/ship/dominian_science_vessel/engineering) "uZz" = ( /obj/effect/landmark/entry_point/port{ @@ -6131,7 +6331,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/starboard_hall) "vcN" = ( /obj/machinery/alarm/north{ @@ -6205,7 +6406,7 @@ "vpA" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, -/turf/template_noop, +/turf/space, /area/ship/dominian_science_vessel/exterior) "vqe" = ( /obj/structure/table/stone/marble, @@ -6215,17 +6416,14 @@ /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) "vty" = ( -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 16; - pixel_x = 11 - }, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = 16 - }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/cable/green{ + icon_state = "2-8"; + dir = 8 + }, +/turf/simulated/floor/greengrid, /area/ship/dominian_science_vessel/engineering) "vtK" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6285,6 +6483,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/hangar) +"vBS" = ( +/obj/machinery/atmospherics/unary/heater{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/port_propulsion) "vCe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6425,10 +6629,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "wji" = ( @@ -6523,7 +6725,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "wAa" = ( /obj/structure/bed/roller, @@ -6551,7 +6756,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/structure/fuel_port/phoron, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "wCu" = ( @@ -6609,7 +6813,9 @@ dir = 8; pixel_x = 19 }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "wGu" = ( /obj/machinery/computer/ship/sensors{ @@ -6642,15 +6848,19 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) -"wJB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +"wJt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) +"wJB" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) @@ -6676,9 +6886,10 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/port_hall) "wNH" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 1 +/obj/machinery/atmospherics/portables_connector{ + dir = 8 }, +/obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "wOl" = ( @@ -6701,7 +6912,8 @@ pixel_y = 12 }, /obj/effect/shuttle_landmark/dominian_science_vessel/dock/aft, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "wPB" = ( /obj/machinery/power/apc/south{ @@ -6796,6 +7008,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/medical{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/infirmary) "xbd" = ( @@ -6810,10 +7025,6 @@ "xdL" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/chapel) -"xef" = ( -/obj/structure/lattice/catwalk, -/turf/template_noop, -/area/ship/dominian_science_vessel/exterior) "xeU" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide, /turf/simulated/floor/plating, @@ -6843,6 +7054,10 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/door/window/northleft{ + dir = 2 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "xjp" = ( @@ -6915,13 +7130,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, +/obj/structure/fuel_port/hydrogen{ + pixel_y = -28 + }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) -"xqX" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/port_hall) "xsa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6964,13 +7177,6 @@ }, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) -"xug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/pipedispenser, -/turf/simulated/floor/plating, -/area/ship/dominian_science_vessel/atmospherics) "xvv" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -6987,7 +7193,6 @@ /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "xwk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -7093,7 +7298,9 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/showers) "xJb" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "xNk" = ( @@ -7202,13 +7409,11 @@ /turf/simulated/floor/reinforced, /area/ship/dominian_science_vessel/isolation) "ylM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) @@ -30422,8 +30627,8 @@ xRX xRX xRX vpA -xef -xef +vMS +vMS vpA xRX xRX @@ -32221,7 +32426,7 @@ xRX xRX doM svV -njl +wJt xlA sZn nqe @@ -32478,7 +32683,7 @@ xRX xRX doM dbC -dQP +arh nKE sZn qry @@ -32732,9 +32937,9 @@ xRX xRX xRX xRX -xRX doM -reI +doM +sZn dQP nKE sZn @@ -32990,7 +33195,7 @@ xRX xRX doM doM -doM +flo sZn ugK hHN @@ -33247,7 +33452,7 @@ xRX xRX nht xOs -amZ +cjK sZn dQP qBt @@ -33504,7 +33709,7 @@ xRX xRX qVe xOs -cjK +qhl fZB dQP sxg @@ -34027,7 +34232,7 @@ iRm mUR kOU cTu -ogi +qFu ogi eIn lBn @@ -34274,8 +34479,8 @@ xRX xRX xRX doM -xeU -qhl +uDw +cjK sZn dQP lCD @@ -34531,10 +34736,10 @@ xRX xRX xRX doM -uDw -sci +xeU +qhl sZn -cwv +dQP mIw sZn vfS @@ -34788,10 +34993,10 @@ xRX xRX xRX doM -lul -lul +xeU +sci sZn -cwv +dQP coi sZn nVP @@ -35303,7 +35508,7 @@ xRX xRX doM xiZ -dQP +gtV dQP dQP dck @@ -35559,8 +35764,8 @@ xRX xRX xRX doM -svV -njl +kKS +qSE njl gtV uYJ @@ -36077,7 +36282,7 @@ ken hMa pfq arh -dQP +tYP sZn lDQ uZo @@ -36875,7 +37080,7 @@ bTi hhf lwX oCX -doI +pXP xRX xRX xRX @@ -37132,7 +37337,7 @@ itH pDc eqS pub -doI +pXP xRX xRX xRX @@ -37389,7 +37594,7 @@ tvT xfT xfT xfT -doI +pXP xRX xRX xRX @@ -37623,12 +37828,12 @@ uOY uOY uOY wny -wny -aaJ -aaJ +maG +maG +maG bxu -wny -wny +maG +maG wny qqr ogz @@ -37906,8 +38111,8 @@ xfT vMS vMS vMS -ajL -ajL +wIx +wIx cTq xRX xRX @@ -39676,7 +39881,7 @@ uOY uOY uOY uOY -aaJ +maG qTV eyA eYR @@ -39933,7 +40138,7 @@ uOY uOY uOY uOY -aaJ +maG xbd bac ezV @@ -40190,7 +40395,7 @@ uOY uOY uOY uOY -aaJ +maG rOg pWg rex @@ -40447,8 +40652,8 @@ uOY uOY uOY uOY -aaJ -aaJ +maG +maG uJi tSP wny @@ -40705,8 +40910,8 @@ uOY uOY uOY noq -aaJ -aaJ +maG +maG nke wny inf @@ -40732,13 +40937,13 @@ oiZ kJp xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX xRX xRX @@ -40963,13 +41168,13 @@ uOY uOY uOY epB -aaJ -aaJ -aaJ -aaJ -asO -wny +maG +maG wny +maG +asO +maG +maG wny uOY uOY @@ -41244,7 +41449,7 @@ nAw pNy wpQ wrJ -xRX +jXJ xRX xRX xRX @@ -41757,7 +41962,7 @@ nSw vjT qAQ qAQ -xRX +pmy xRX xRX xRX @@ -42014,8 +42219,8 @@ kwj qAQ qAQ xRX -xRX -xRX +pmy +jXJ xRX xRX xRX @@ -42271,7 +42476,7 @@ qAQ qAQ xRX xRX -xRX +pmy xRX xRX xRX @@ -42528,7 +42733,7 @@ qAQ xRX xRX xRX -xRX +pmy xRX xRX xRX @@ -42785,8 +42990,8 @@ xRX xRX xRX xRX -xRX -xRX +pmy +jXJ xRX xRX xRX @@ -43042,7 +43247,7 @@ xRX xRX xRX xRX -xRX +pmy xRX xRX xRX @@ -43298,9 +43503,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX +qNB +lzq +lzq xRX xRX xRX @@ -43549,15 +43754,15 @@ qzZ qAQ qAQ aXp -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +pmy +pmy +pmy +pmy +pmy +pmy +efw +jOi +lhP xRX xRX xRX @@ -43812,8 +44017,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -44061,6 +44266,7 @@ cxU seO qAQ qAQ +pmy xRX xRX xRX @@ -44068,10 +44274,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX +efw +ope +jXJ xRX xRX xRX @@ -44318,6 +44523,7 @@ oCE dHh dHh xRX +pmy xRX xRX xRX @@ -44325,9 +44531,8 @@ xRX xRX xRX xRX -xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -44573,18 +44778,18 @@ lml dnN hOQ hcG -xef -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +vMS +lzq +lzq +lzq +lzq +lzq +lzq +lzq +lzq +lzq +jOi +ope xRX xRX xRX @@ -44815,8 +45020,8 @@ vha lfS cYr tfK -xqX -kfB +gRZ +lml ojZ oqw fYJ @@ -44830,19 +45035,19 @@ kfB uDy aZo alp -xef -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +vMS +jOi +lhP +lhP +lhP +lhP +lhP +lhP +lhP +lhP +lhP +oat +jXJ xRX xRX xRX @@ -45088,7 +45293,7 @@ wLq wLq wLq vpA -xRX +ope xRX xRX xRX @@ -45328,9 +45533,9 @@ ufx vha dWx cNM -tfK -keG -lml +bns +gRZ +ooL wgJ mEX sFQ @@ -45344,8 +45549,8 @@ aBY xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -45583,12 +45788,12 @@ xRX xRX gJx gJx -gJx -tfK -tfK -bUF -lml -wgJ +vBS +fIw +fIw +gRZ +cDs +mBX mEX sFQ rkg @@ -45597,6 +45802,12 @@ qKW wNH aBY aBY +pmy +pmy +pmy +pmy +efw +ope xRX xRX xRX @@ -45607,13 +45818,7 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +jXJ xRX xRX xRX @@ -45839,18 +46044,18 @@ xRX xRX xRX xRX -xRX wLq -dWZ -lml -lml +wLq +gRZ +gRZ +gRZ lml -wgJ +mBX mEX jOW gUu uWe -vmg +fuZ aBY aBY xRX @@ -45858,8 +46063,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -46099,9 +46304,9 @@ xRX xRX wLq wLq -kXR -lml -lml +wLq +cod +lCK qdb hKv xwk @@ -46115,6 +46320,8 @@ xRX xRX xRX xRX +efw +ope xRX xRX xRX @@ -46127,15 +46334,13 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX -xRX -xRX +qmw xRX xRX xRX @@ -46355,15 +46560,15 @@ xRX xRX xRX xRX +xRX wLq -xqX -kfB -kfB +raL +avG lCK mEX uFw -xug -jzp +vmg +aBY uZz xRX xRX @@ -46372,17 +46577,17 @@ xRX xRX xRX xRX +efw +ope xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX -xRX -xRX +qmw xRX xRX xRX @@ -46612,10 +46817,10 @@ xRX xRX xRX xRX +xRX wLq wLq -wLq -lml +cqC vUO mEX kfu @@ -46629,8 +46834,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -46886,9 +47091,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX +efw +ope +jXJ xRX xRX xRX @@ -47143,8 +47348,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -47400,8 +47605,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -47646,20 +47851,20 @@ wLq knD ttW wLq -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +pmy +pmy +pmy +pmy +pmy +pmy +pmy +pmy +pmy +pmy +pmy +efw +ope +jXJ xRX xRX xRX @@ -47914,8 +48119,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -48171,8 +48376,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -48428,9 +48633,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX +efw +ope +jXJ xRX xRX xRX @@ -48685,8 +48890,8 @@ xRX xRX xRX xRX -xRX -xRX +efw +ope xRX xRX xRX @@ -48942,9 +49147,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX +efw +jOi +lzq xRX xRX xRX @@ -49199,9 +49404,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX +ttP +lhP +lhP xRX xRX xRX @@ -49715,7 +49920,7 @@ xRX xRX xRX xRX -xRX +jXJ xRX xRX xRX @@ -50486,7 +50691,7 @@ xRX xRX xRX xRX -xRX +jXJ xRX xRX xRX @@ -51257,7 +51462,7 @@ xRX xRX xRX xRX -xRX +jXJ xRX xRX xRX @@ -51773,13 +51978,13 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX xRX xRX From 38a485ef2e4951b9dc51bada152ecb1ecb22139e Mon Sep 17 00:00:00 2001 From: Joshie Date: Fri, 4 Oct 2024 19:51:48 +1000 Subject: [PATCH 2/6] Pt 2 --- .../dominian_science_vessel.dmm | 985 +++++++++--------- 1 file changed, 508 insertions(+), 477 deletions(-) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index efa35e34a53..c117f925998 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -28,8 +28,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "ahw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) @@ -77,6 +77,9 @@ cycle_to_external_air = 1 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "aqS" = ( @@ -136,6 +139,13 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) @@ -196,14 +206,11 @@ /turf/simulated/floor/tiled/white, /area/shuttle/dominian_science_shuttle) "aBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/alarm/east{ - req_access = list(226); - req_one_access = null +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) @@ -239,12 +246,6 @@ /obj/effect/shuttle_landmark/dominian_science_shuttle/hangar, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) -"aHw" = ( -/obj/machinery/computer/ship/navigation{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/bridge) "aHL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -282,16 +283,18 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "aMc" = ( -/obj/structure/cable/pink{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "aMY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 10 + }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "aOT" = ( @@ -372,6 +375,10 @@ pixel_y = 2; pixel_x = 14 }, +/obj/item/rig/hazmat{ + req_access = null; + req_one_access = null + }, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "aXp" = ( @@ -396,9 +403,6 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "bac" = ( -/obj/structure/cable/pink{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -420,6 +424,15 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) +"biU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "bjV" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -432,9 +445,6 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "bkQ" = ( -/obj/structure/cable/pink{ - icon_state = "1-2" - }, /obj/structure/cable/pink{ icon_state = "2-4" }, @@ -452,8 +462,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "bon" = ( /obj/machinery/door/airlock/engineering{ @@ -570,9 +581,6 @@ }, /area/ship/dominian_science_vessel/isolation) "bDg" = ( -/obj/structure/cable/pink{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -672,9 +680,28 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) +"cfU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/aft_dock) +"cgp" = ( +/obj/structure/table/rack{ + dir = 8 + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/accessory/armor_plate/heavy/dominia, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/head/helmet/space/void/dominia, +/obj/item/clothing/suit/space/void/dominia, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/eva) "cjK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "ckh" = ( /obj/structure/window/reinforced{ @@ -728,12 +755,6 @@ }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) -"cpy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/wall/shuttle, -/area/shuttle/dominian_science_shuttle) "cqC" = ( /obj/machinery/light{ dir = 1 @@ -802,38 +823,37 @@ }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"cDq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "cDs" = ( /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) "cHM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /obj/structure/cable/pink{ icon_state = "1-8" }, -/obj/structure/cable/pink{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) +"cJY" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/port_propulsion) "cKb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) "cMo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 }, /turf/simulated/wall/shuttle, @@ -842,10 +862,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "cPn" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -905,6 +925,12 @@ }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) +"cXm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "cXt" = ( /obj/machinery/appliance/cooker/stove, /obj/effect/floor_decal/corner/dark_blue/diagonal, @@ -921,14 +947,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) -"cYw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/shuttle/dominian_science_shuttle) "cYy" = ( /obj/structure/closet/crate, /obj/item/clothing/suit/space/anomaly{ @@ -999,21 +1019,15 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) -"dfe" = ( -/obj/machinery/computer/ship/targeting{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/bridge) "dhW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 10 }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "diE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/atmospherics/portables_connector/supply{ + dir = 1 }, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, @@ -1101,17 +1115,9 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/aft_dock) "dqJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/plating, -/area/shuttle/dominian_science_shuttle) -"drI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/pink{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "dsC" = ( @@ -1249,11 +1255,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/starboard_hall) -"dMj" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, -/area/shuttle/dominian_science_shuttle) "dMl" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -1263,7 +1264,12 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, -/obj/structure/closet/toolcloset, +/obj/structure/table/steel, +/obj/machinery/cell_charger{ + pixel_y = 0 + }, +/obj/item/blueprints, +/obj/item/pen/drafting, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "dQg" = ( @@ -1336,8 +1342,10 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/starboard_hall) "dWx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "dZw" = ( /obj/structure/bed/stool/chair{ @@ -1364,7 +1372,7 @@ dir = 1 }, /turf/space, -/area/space) +/area/ship/dominian_science_vessel/exterior) "ekb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1373,14 +1381,9 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/eva) "ekH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, /obj/structure/table/steel, /obj/item/wrench{ pixel_y = 4; @@ -1418,19 +1421,6 @@ /obj/machinery/iff_beacon/name_change, /turf/simulated/floor/airless, /area/shuttle/dominian_science_shuttle) -"eqL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/structure/cable/pink{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/shuttle/dominian_science_shuttle) "eqS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 @@ -1461,9 +1451,6 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "eyA" = ( -/obj/structure/cable/pink{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1547,6 +1534,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/plastic/full, +/obj/item/stack/material/aluminium/full, +/obj/item/stack/material/lead/full, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "eIb" = ( @@ -1596,7 +1588,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_propulsion) "eKR" = ( -/obj/machinery/computer/ship/engines, /obj/effect/floor_decal/corner/blue{ dir = 10 }, @@ -1773,19 +1764,29 @@ /obj/machinery/atmospherics/unary/heater{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) +"fmJ" = ( +/obj/structure/platform_stairs/full/south_north_cap{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/bridge) "fnE" = ( /obj/structure/table/steel, /obj/item/device/binoculars, +/obj/machinery/button/distress{ + dir = 4; + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/device/binoculars/high_power, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "fnY" = ( /obj/machinery/door/airlock/external, /obj/effect/floor_decal/industrial/hatch/red, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9 - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28; @@ -1798,6 +1799,9 @@ cycle_to_external_air = 1 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "foH" = ( @@ -1813,12 +1817,14 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/starboard_hall) "fpC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/alarm/south{ req_access = list(226); req_one_access = null }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "fsO" = ( /turf/simulated/wall/r_wall, @@ -1841,18 +1847,21 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "fvv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "fws" = ( /obj/machinery/door/airlock/external, /obj/effect/floor_decal/industrial/hatch/red, -/obj/machinery/atmospherics/pipe/manifold/hidden/red, /obj/structure/cable{ icon_state = "1-2" }, @@ -1868,6 +1877,7 @@ cycle_to_external_air = 1 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/atmospherics/pipe/manifold/hidden/black, /turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "fxK" = ( @@ -1886,6 +1896,7 @@ pixel_y = 32; stand_icon = "banner" }, +/obj/item/clothing/accessory/flagpatch/dominia, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "fxR" = ( @@ -1947,7 +1958,8 @@ /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_propulsion) "fMI" = ( /obj/structure/railing/mapped{ @@ -1964,6 +1976,9 @@ /obj/structure/platform{ dir = 8 }, +/obj/structure/platform_deco/ledge{ + dir = 9 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "fPm" = ( @@ -2331,19 +2346,19 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "huE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/portables_connector/scrubber{ + dir = 1 }, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "huX" = ( -/obj/structure/table/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars/high_power, /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "hwR" = ( @@ -2425,10 +2440,12 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "hGR" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/closet/walllocker/firecloset{ + pixel_x = 32 }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "hHG" = ( @@ -2483,9 +2500,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) "hJs" = ( -/obj/structure/cable/pink{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2597,9 +2611,6 @@ /area/ship/dominian_science_vessel/bridge) "hZH" = ( /obj/machinery/door/window/northleft, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "hZN" = ( @@ -2638,6 +2649,7 @@ req_access = list(226) }, /obj/structure/cable, +/obj/item/reagent_containers/inhaler/pneumalin, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/infirmary) "ihM" = ( @@ -2836,10 +2848,7 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "iRD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /turf/simulated/floor/plating, @@ -2881,13 +2890,17 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "iWi" = ( -/obj/structure/cable/pink{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6; pixel_y = 0 @@ -2904,6 +2917,7 @@ /obj/item/clothing/head/helmet/pilot{ pixel_x = 1 }, +/obj/item/clipboard, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "iZq" = ( @@ -2971,8 +2985,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "jkM" = ( /obj/effect/floor_decal/industrial/outline/firefighting_closet, @@ -3030,6 +3044,10 @@ }, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) +"jwB" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/aft_dock) "jxb" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -3062,8 +3080,6 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/structure/dispenser/oxygen, /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "jDu" = ( @@ -3087,9 +3103,10 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "jHZ" = ( -/obj/structure/table/steel, /obj/effect/floor_decal/corner/blue/full, -/obj/item/extinguisher, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "jLI" = ( @@ -3097,10 +3114,6 @@ /obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) -"jOi" = ( -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "jOW" = ( /obj/machinery/power/apc/north{ req_access = list(226) @@ -3167,7 +3180,7 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/infirmary) "kaR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ +/obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 }, /turf/simulated/wall/shuttle, @@ -3300,6 +3313,9 @@ cycle_to_external_air = 1 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/dominian_science_shuttle) "krH" = ( @@ -3323,8 +3339,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/mess) "kyc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/black{ + dir = 4 }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) @@ -3339,11 +3355,8 @@ /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "kAa" = ( -/obj/structure/table/steel, -/obj/item/device/multitool, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" +/obj/machinery/computer/ship/engines/terminal{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) @@ -3394,6 +3407,10 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) +"kMV" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "kOU" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/purple/diagonal, @@ -3457,18 +3474,18 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/binary/pump/scrubber/on{ + name = "Scrubbers to Waste"; + target_pressure = 15000 + }, +/obj/machinery/alarm/west, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "kXV" = ( /obj/effect/floor_decal/corner/yellow/full, -/obj/structure/table/steel, -/obj/machinery/cell_charger{ - pixel_y = 0 +/obj/machinery/vending/engineering{ + req_access = null }, -/obj/item/blueprints, -/obj/item/pen/drafting, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "leu" = ( @@ -3478,18 +3495,8 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "lfS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) -"lhP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/space, -/area/space) "liI" = ( /obj/machinery/door/airlock/command{ req_access = list(226); @@ -3525,7 +3532,7 @@ /obj/machinery/atmospherics/binary/pump/high_power{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "lpa" = ( /obj/structure/cable{ @@ -3561,12 +3568,12 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "lsx" = ( -/obj/machinery/computer/ship/navigation{ - dir = 8 - }, /obj/machinery/light{ icon_state = "tube_empty" }, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "luj" = ( @@ -3618,13 +3625,6 @@ "lxi" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/engineering) -"lzq" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/space, -/area/space) "lBn" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/officer) @@ -3648,15 +3648,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) "lDj" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - inserted_light = /obj/item/light/tube/colored/blue; - icon_state = "tube_empty" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/closet/walllocker/emerglocker/west, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "lDQ" = ( @@ -3708,10 +3701,17 @@ }, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/research) -"lUe" = ( -/obj/machinery/suit_storage_unit/standard_unit, +"lUZ" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/sign/flag/volvalaad{ + pixel_y = 32; + stand_icon = "banner" + }, +/obj/item/device/multitool, /turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/eva) +/area/ship/dominian_science_vessel/bridge) "lXp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4088,9 +4088,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "nke" = ( -/obj/machinery/computer/ship/helm{ - dir = 8; - accellimit = 0.005 +/obj/machinery/computer/ship/helm/terminal{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) @@ -4218,12 +4217,16 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "nEY" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/portables_connector/fuel{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) +"nHE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/shuttle, +/area/shuttle/dominian_science_shuttle) "nKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4249,10 +4252,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -4293,7 +4292,7 @@ }, /obj/structure/railing/mapped, /turf/space, -/area/space) +/area/ship/dominian_science_vessel/exterior) "odj" = ( /obj/structure/table/steel, /obj/item/storage/belt/medical{ @@ -4363,7 +4362,7 @@ /obj/machinery/atmospherics/binary/pump/high_power{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "ojZ" = ( /obj/structure/cable{ @@ -4407,11 +4406,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) -"ope" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped, -/turf/space, -/area/space) "opf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4560,6 +4554,7 @@ /obj/structure/table/stone/marble, /obj/item/book/manual/dominia_honor, /obj/item/device/versebook/tribunal, +/obj/item/nullrod/dominia, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) "oMn" = ( @@ -4708,10 +4703,13 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "pfE" = ( +/obj/structure/platform, /obj/structure/platform{ dir = 4 }, -/obj/structure/platform, +/obj/structure/platform_deco/ledge{ + dir = 5 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "pge" = ( @@ -4958,9 +4956,9 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) "qhl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/meter, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "qll" = ( /obj/machinery/power/portgen/basic/fusion, @@ -5026,18 +5024,10 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/infirmary) "qyg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "qzk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ @@ -5069,6 +5059,12 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) +"qBM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/wall/shuttle, +/area/shuttle/dominian_science_shuttle) "qFu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/purple/diagonal, @@ -5102,10 +5098,7 @@ }, /obj/structure/closet/crate/internals, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "qKW" = ( /obj/machinery/atmospherics/binary/pump/on{ @@ -5159,7 +5152,7 @@ dir = 8 }, /turf/space, -/area/space) +/area/ship/dominian_science_vessel/exterior) "qPA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -5229,9 +5222,11 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/hangar) "ril" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/machinery/meter, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_propulsion) "riv" = ( /obj/machinery/alarm/west{ @@ -5282,17 +5277,7 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "rvU" = ( -/obj/structure/table/rack{ - dir = 8 - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/void/dominia/voidsman, -/obj/item/clothing/head/helmet/space/void/dominia/voidsman, -/obj/item/clothing/suit/space/void/dominia/voidsman, -/obj/item/clothing/suit/space/void/dominia/voidsman, +/obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" @@ -5391,17 +5376,21 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/center_hall) "rOg" = ( -/obj/machinery/computer/ship/engines{ - dir = 8 - }, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/machinery/computer/ship/engines/terminal{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "rRI" = ( /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/isolation) +"rSk" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/hangar) "rWF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -5413,10 +5402,10 @@ /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "sci" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "seO" = ( /obj/machinery/shower{ @@ -5459,8 +5448,6 @@ /obj/item/clothing/accessory/holster/waist/brown, /obj/item/clothing/accessory/holster, /obj/item/device/flash, -/obj/item/clothing/suit/armor/carrier/heavy, -/obj/item/clothing/head/helmet/merc, /obj/structure/sign/flag/dominia{ pixel_y = 32; stand_icon = "banner" @@ -5477,6 +5464,9 @@ desc = "An energy saber with Imperial Fleet heraldry on its hilt. This likely belongs to a low-ranking officer, and likely a Ma’zal at that: any real officer would’ve purchased a legitimate blade, not this."; desc_antag = "Swords are common symbols of office and ceremonial implements throughout the human navies of the Orion Spur, and the Empire of Dominia is no exception. Energy-based daggers and swords of various styles are often carried by officers and personnel as both tools and, if the situation demands it, weaponry. Fleet officers take particular pride in their blades and are known to go through the painstaking process of having a legitimate sword forged, even though said sword is likely far less practical than the “lesser” energy-based counterpart it is intended to replace." }, +/obj/item/clothing/head/helmet/dominia, +/obj/item/clothing/suit/armor/carrier/dominia, +/obj/item/clothing/accessory/armor_plate/heavy/dominia, /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "spB" = ( @@ -5576,7 +5566,9 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "sBA" = ( -/obj/machinery/computer/ship/targeting, +/obj/machinery/computer/ship/targeting/terminal{ + dir = 1 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "sBG" = ( @@ -5588,25 +5580,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) -"sFI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/obj/structure/cable/pink{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/shuttle/dominian_science_shuttle) "sFQ" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) "sGi" = ( -/obj/structure/platform_stairs, +/obj/structure/platform_stairs/full/south_north_cap, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "sGw" = ( @@ -5705,6 +5684,12 @@ }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"sXH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/port_propulsion) "sZn" = ( /turf/simulated/wall/r_wall, /area/ship/dominian_science_vessel/aft_dock) @@ -5714,6 +5699,13 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) +"tdO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/shuttle/dominian_science_shuttle) "tfg" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, @@ -5740,7 +5732,8 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_propulsion) "tjB" = ( /turf/simulated/wall/r_wall, @@ -5867,9 +5860,9 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) "tsC" = ( -/obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/dispenser/oxygen, +/turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "ttP" = ( /obj/structure/lattice/catwalk, @@ -5880,7 +5873,7 @@ dir = 4 }, /turf/space, -/area/space) +/area/ship/dominian_science_vessel/exterior) "ttW" = ( /obj/effect/map_effect/marker/airlock/docking{ master_tag = "airlock_dominian_science_dock_port"; @@ -5938,7 +5931,9 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "tCH" = ( -/obj/machinery/computer/ship/helm, +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "tEo" = ( @@ -6013,6 +6008,9 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "ubr" = ( @@ -6021,6 +6019,11 @@ }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) +"ueo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "ufx" = ( /obj/machinery/atmospherics/unary/engine, /turf/simulated/floor/plating, @@ -6031,9 +6034,20 @@ /area/ship/dominian_science_vessel/aft_dock) "uic" = ( /obj/structure/table/stone/marble, -/obj/item/nullrod/dominia, +/obj/structure/sign/painting_frame/goddess/scholar{ + pixel_y = 3 + }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"ujq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/port_hall) "ujP" = ( /obj/structure/toilet{ dir = 1 @@ -6067,6 +6081,12 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/hangar) +"upq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "upC" = ( /obj/machinery/door/airlock/service{ dir = 4; @@ -6176,7 +6196,8 @@ "uDw" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uDy" = ( /obj/machinery/door/airlock/external{ @@ -6245,19 +6266,18 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uJi" = ( -/obj/machinery/computer/ship/sensors, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/machinery/computer/ship/sensors/terminal, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) -"uNN" = ( -/obj/machinery/computer/ship/navigation, -/obj/effect/floor_decal/corner/blue{ - dir = 10 +"uNl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/bridge) +/area/shuttle/dominian_science_shuttle) "uOY" = ( /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) @@ -6291,9 +6311,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "uYJ" = ( @@ -6321,6 +6339,15 @@ }, /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/atmospherics) +"vaH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "vaL" = ( /obj/machinery/door/airlock/service{ name = "Ship Weapon and Armory" @@ -6357,11 +6384,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/closet/toolcloset, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "vha" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/port_propulsion) "vjQ" = ( @@ -6403,11 +6431,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/infirmary) -"vpA" = ( -/obj/structure/lattice/catwalk, -/obj/item/hullbeacon/red, -/turf/space, -/area/ship/dominian_science_vessel/exterior) "vqe" = ( /obj/structure/table/stone/marble, /obj/item/storage/box/fancy/candle_box, @@ -6415,6 +6438,13 @@ /obj/effect/floor_decal/corner/full, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) +"vrW" = ( +/obj/machinery/door/blast/regular{ + dir = 4 + }, +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/simulated/floor/plating, +/area/ship/dominian_science_vessel/hangar) "vty" = ( /obj/machinery/light{ dir = 4 @@ -6487,7 +6517,8 @@ /obj/machinery/atmospherics/unary/heater{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_propulsion) "vCe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6502,24 +6533,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) "vCu" = ( -/obj/structure/table/steel, -/obj/item/folder, -/obj/item/folder/red, -/obj/item/folder/yellow, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/pen/blue, -/obj/item/clipboard, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/button/distress{ - dir = 4; - pixel_x = -8; - pixel_y = 7 +/obj/machinery/computer/ship/targeting/terminal{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) @@ -6574,14 +6589,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/mess) "vTv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/binary/pump/high_power, /obj/machinery/alarm/west{ req_one_access = null; req_access = list(226) }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "vUO" = ( @@ -6599,10 +6614,6 @@ }, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) -"wbT" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/eva) "wcv" = ( /obj/structure/bed/padded, /obj/item/bedsheet/purple, @@ -6619,6 +6630,12 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) +"wge" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/wall/shuttle, +/area/shuttle/dominian_science_shuttle) "wgJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6634,16 +6651,11 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "wji" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 }, -/obj/machinery/meter, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/light{ - dir = 8; - inserted_light = /obj/item/light/tube/colored/blue; - icon_state = "tube_empty" + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) @@ -6753,26 +6765,19 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/officer) "wBq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 8 }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "wCu" = ( -/obj/structure/closet/crate/weld, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/head/welding, -/obj/item/weldingtool/emergency, -/obj/item/weldingtool, -/obj/item/weldingtool/largetank, /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, +/obj/machinery/autolathe, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "wCJ" = ( @@ -6818,12 +6823,12 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "wGu" = ( -/obj/machinery/computer/ship/sensors{ - dir = 4 - }, /obj/machinery/light{ icon_state = "tube_empty" }, +/obj/machinery/computer/ship/sensors/terminal{ + dir = 4 + }, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "wHI" = ( @@ -6845,7 +6850,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "wIV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 8; + name = "Fuel Tank to Thrusters" + }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "wJt" = ( @@ -7027,7 +7035,8 @@ /area/ship/dominian_science_vessel/chapel) "xeU" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/engineering, +/turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "xfT" = ( /turf/simulated/wall/shuttle, @@ -7090,6 +7099,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/item/extinguisher, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "xkY" = ( @@ -7127,12 +7137,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/starboard_hall) "xoc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, /obj/structure/fuel_port/hydrogen{ pixel_y = -28 }, +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 8; + name = "Connector to Thrusters" + }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "xsa" = ( @@ -7187,9 +7198,12 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/officer) "xwj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "xwk" = ( @@ -7223,7 +7237,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) "xzG" = ( @@ -7303,6 +7316,10 @@ }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/atmospherics) +"xJX" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, +/turf/simulated/wall/shuttle, +/area/ship/dominian_science_vessel/aft_dock) "xNk" = ( /obj/structure/cable/pink{ icon_state = "0-8" @@ -7316,7 +7333,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "xOs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/aft_dock) "xPu" = ( @@ -7341,9 +7360,12 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/hangar) "xPN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "xQH" = ( @@ -7375,16 +7397,21 @@ dir = 8 }, /obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/accessory/armor_plate/heavy/dominia, +/obj/item/clothing/accessory/armor_plate/heavy/dominia, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/void/dominia, -/obj/item/clothing/suit/space/void/dominia, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/head/helmet/space/void/dominia/voidsman, +/obj/item/clothing/head/helmet/space/void/dominia/voidsman, +/obj/item/clothing/suit/space/void/dominia/voidsman, +/obj/item/clothing/suit/space/void/dominia/voidsman, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) "xXN" = ( /obj/machinery/door/window/northleft, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 +/obj/machinery/atmospherics/binary/passive_gate/supply{ + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) @@ -7408,6 +7435,10 @@ /obj/structure/anomaly_container, /turf/simulated/floor/reinforced, /area/ship/dominian_science_vessel/isolation) +"yem" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor/tiled/dark, +/area/ship/dominian_science_vessel/aft_dock) "ylM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28818,6 +28849,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -28838,8 +28870,7 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX xRX @@ -29589,6 +29620,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -29609,8 +29641,7 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX xRX @@ -30360,6 +30391,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -30380,8 +30412,7 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX xRX @@ -30626,10 +30657,6 @@ xRX xRX xRX xRX -vpA -vMS -vMS -vpA xRX xRX xRX @@ -30803,12 +30830,13 @@ xRX xRX xRX xRX -"} -(92,1,1) = {" xRX xRX xRX xRX +"} +(92,1,1) = {" +xRX xRX xRX xRX @@ -30879,21 +30907,24 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX +qmw doM mWJ dol doM +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX xRX xRX @@ -31655,8 +31686,8 @@ xRX xRX xRX doM -dQP -xPu +upq +biU sZn bzK mBb @@ -33699,16 +33730,16 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX qVe -xOs +xJX qhl fZB dQP @@ -33965,7 +33996,7 @@ xRX xRX xRX nht -xOs +cfU fpC sZn dQP @@ -34221,7 +34252,7 @@ xRX xRX xRX xRX -doM +jwB doM ojO sZn @@ -34480,7 +34511,7 @@ xRX xRX doM uDw -cjK +yem sZn dQP lCD @@ -34992,7 +35023,7 @@ xRX xRX xRX xRX -doM +jwB xeU sci sZn @@ -35763,7 +35794,7 @@ xRX xRX xRX xRX -doM +jwB kKS qSE njl @@ -36281,7 +36312,7 @@ wPk ken hMa pfq -arh +vaH tYP sZn lDQ @@ -36538,7 +36569,7 @@ trE wDo uwQ aLz -dQP +cXm jkM sZn qll @@ -37048,7 +37079,7 @@ xRX xRX xRX xRX -xzG +rSk uOY uOY vEu @@ -37819,7 +37850,7 @@ xRX xRX xRX xRX -siX +vrW uOY uOY uOY @@ -38094,7 +38125,7 @@ lvo wny dhW kyc -wny +kaR wny haa jZe @@ -38345,9 +38376,9 @@ aAX mET mET ckh -dMj rex rex +uNl kXm lDj huE @@ -38590,7 +38621,7 @@ xRX xRX xRX xRX -siX +vrW uOY uOY uOY @@ -38604,7 +38635,7 @@ fDv jXM puW iVM -rex +tdO xXN iRD diE @@ -38613,11 +38644,11 @@ uBe haa jZe tjB -tyS trF +tyS rvU -lUe tyS +cgp tjB oNY bpc @@ -38861,11 +38892,11 @@ elq oAQ qyg fvv -cYw +rex ekH aBD dqJ -cpy +xPN lri haa eQC @@ -38879,7 +38910,7 @@ tjB aHs bpc xyE -xSb +lUZ krH eKR mFl @@ -39096,13 +39127,13 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX siX uOY @@ -39121,7 +39152,7 @@ atj rex uCK ahw -aMY +nHE aMY kaR haa @@ -39137,7 +39168,7 @@ rNv oNk xyE xjP -aHw +ibh rMW fNZ gcq @@ -39373,7 +39404,7 @@ bDg jGb xNk rex -sFI +rex fZq jjy dEo @@ -39630,7 +39661,7 @@ hJs wny wny oBB -sFI +rex rex rex kpq @@ -39653,7 +39684,7 @@ oNi wCJ ibh tav -sGi +fmJ kwe fnE sOb @@ -39887,11 +39918,11 @@ eyA eYR wny oXc -sFI +rex rex eBK bYr -wny +wge wny wny wny @@ -39902,13 +39933,13 @@ rfO tyS tyS tyS -wbT +tyS tjB kAl bSl xyE ndX -dfe +ibh fRv pfE gcq @@ -40144,8 +40175,8 @@ bac ezV wny qMS -eqL -drI +rex +rex qJb nKK wji @@ -40166,7 +40197,7 @@ bpc xyE xSb krH -uNN +eKR mFl lsx mqx @@ -40407,7 +40438,7 @@ rex hZH wIV xoc -xPN +qBM luj qdL jZe @@ -43504,8 +43535,8 @@ xRX xRX xRX qNB -lzq -lzq +wIx +wIx xRX xRX xRX @@ -43761,8 +43792,8 @@ pmy pmy pmy efw -jOi -lhP +vMS +eIb xRX xRX xRX @@ -44018,7 +44049,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -44275,7 +44306,7 @@ xRX xRX xRX efw -ope +pXP jXJ xRX xRX @@ -44532,7 +44563,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -44774,22 +44805,22 @@ vtK sGw lml lml -lml +kMV dnN hOQ hcG vMS -lzq -lzq -lzq -lzq -lzq -lzq -lzq -lzq -lzq -jOi -ope +wIx +wIx +wIx +wIx +wIx +wIx +wIx +wIx +wIx +vMS +pXP xRX xRX xRX @@ -45031,21 +45062,21 @@ cQn kfB kfB kfB -kfB +ueo uDy aZo alp vMS -jOi -lhP -lhP -lhP -lhP -lhP -lhP -lhP -lhP -lhP +vMS +eIb +eIb +eIb +eIb +eIb +eIb +eIb +eIb +eIb oat jXJ xRX @@ -45273,7 +45304,7 @@ xRX xRX xRX eKj -vha +cJY ril loJ jjX @@ -45292,8 +45323,8 @@ wLq wLq wLq wLq -vpA -ope +vMS +pXP xRX xRX xRX @@ -45530,7 +45561,7 @@ xRX xRX xRX ufx -vha +sXH dWx cNM bns @@ -45550,7 +45581,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -45807,7 +45838,7 @@ pmy pmy pmy efw -ope +pXP xRX xRX xRX @@ -46064,7 +46095,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -46321,7 +46352,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -46578,7 +46609,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX qmw @@ -46835,7 +46866,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -47077,8 +47108,8 @@ xRX xRX xRX wLq -lml -vUO +cDq +ujq mEX aBY aBY @@ -47092,7 +47123,7 @@ xRX xRX xRX efw -ope +pXP jXJ xRX xRX @@ -47349,7 +47380,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -47606,7 +47637,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -47863,7 +47894,7 @@ pmy pmy pmy efw -ope +pXP jXJ xRX xRX @@ -48097,30 +48128,30 @@ xRX xRX xRX xRX +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw wLq feI hHI wLq +qmw xRX xRX +qmw xRX xRX -xRX -xRX -xRX +qmw xRX xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -48377,7 +48408,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -48609,6 +48640,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -48629,12 +48661,11 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX efw -ope +pXP jXJ xRX xRX @@ -48891,7 +48922,7 @@ xRX xRX xRX efw -ope +pXP xRX xRX xRX @@ -49148,8 +49179,8 @@ xRX xRX xRX efw -jOi -lzq +vMS +wIx xRX xRX xRX @@ -49380,6 +49411,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -49400,13 +49432,12 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX ttP -lhP -lhP +eIb +eIb xRX xRX xRX @@ -50151,6 +50182,7 @@ xRX xRX xRX xRX +jXJ xRX xRX xRX @@ -50171,8 +50203,7 @@ xRX xRX xRX xRX -xRX -xRX +jXJ xRX xRX xRX From 4462d4977ca8e105e75fd4245ac2e937582b898b Mon Sep 17 00:00:00 2001 From: Joshie Date: Wed, 6 Nov 2024 17:01:37 +1100 Subject: [PATCH 3/6] Changes + Changelog --- .../furrycactus-dominia_dorito_tweaks.yml | 58 +++++++++++++++++++ .../dominian_science_vessel.dm | 10 ++++ .../dominian_science_vessel.dmm | 24 +++++++- 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/furrycactus-dominia_dorito_tweaks.yml diff --git a/html/changelogs/furrycactus-dominia_dorito_tweaks.yml b/html/changelogs/furrycactus-dominia_dorito_tweaks.yml new file mode 100644 index 00000000000..cf3a1094e30 --- /dev/null +++ b/html/changelogs/furrycactus-dominia_dorito_tweaks.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Furrycactus + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Makes a few tiny updates and QoL changes to the Dominian science vessel." diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm index 3dba1356891..3b16c98a342 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm @@ -101,6 +101,16 @@ landmark_tag = "nav_dominian_science_dock_aft" docking_controller = "airlock_dominian_science_dock_aft" +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_1 + name = "Dock, Fore Port 1" + landmark_tag = "nav_dominian_science_dock_fore_1" + docking_controller = "airlock_dominian_science_dock_fore_1" + +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_2 + name = "Dock, Fore Port 2" + landmark_tag = "nav_dominian_science_dock_fore_2" + docking_controller = "airlock_dominian_science_dock_fore_2" + //shuttle stuff /obj/effect/overmap/visitable/ship/landable/dominian_science_shuttle name = "Dominian Science Shuttle" diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index c117f925998..efdaf2fcc2e 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -3677,6 +3677,16 @@ }, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) +"lPE" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_1{ + dir = 1 + }, +/turf/space, +/area/ship/dominian_science_vessel/exterior) "lRV" = ( /obj/machinery/door/airlock/research{ dir = 4; @@ -6680,6 +6690,16 @@ }, /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/quarters) +"wsq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_2{ + dir = 1 + }, +/turf/space, +/area/ship/dominian_science_vessel/exterior) "wtL" = ( /obj/machinery/optable, /obj/effect/floor_decal/corner/green/full{ @@ -43793,7 +43813,7 @@ pmy pmy efw vMS -eIb +lPE xRX xRX xRX @@ -49437,7 +49457,7 @@ xRX xRX ttP eIb -eIb +wsq xRX xRX xRX From 6e2e462a5cd70fb5432ab4d26cd58c83b675fda2 Mon Sep 17 00:00:00 2001 From: Joshie Date: Wed, 6 Nov 2024 17:23:46 +1100 Subject: [PATCH 4/6] Adjustments --- .../dominian_science_vessel.dm | 32 ++++ .../dominian_science_vessel.dmm | 168 ++++-------------- 2 files changed, 69 insertions(+), 131 deletions(-) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm index 3b16c98a342..8c7f201ea22 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm @@ -96,6 +96,11 @@ landmark_tag = "nav_dominian_science_dock_port" docking_controller = "airlock_dominian_science_dock_port" +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/stbd + name = "Dock, Starboard" + landmark_tag = "nav_dominian_science_dock_stbd" + docking_controller = "airlock_dominian_science_dock_stbd" + /obj/effect/shuttle_landmark/dominian_science_vessel/dock/aft name = "Dock, Aft" landmark_tag = "nav_dominian_science_dock_aft" @@ -111,6 +116,33 @@ landmark_tag = "nav_dominian_science_dock_fore_2" docking_controller = "airlock_dominian_science_dock_fore_2" +//airlocks + +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore + name = "Port Fore Airlock" + master_tag = "airlock_dominian_science_vessel_port_fore" + +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore + name = "Starboard Fore Airlock" + master_tag = "airlock_dominian_science_vessel_port_stbd" + +//docks + +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port + name = "Dock, Port" + landmark_tag = "nav_dominian_science_dock_port" + master_tag = "airlock_dominian_science_dock_port" + +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd + name = "Dock, Starboard" + landmark_tag = "nav_dominian_science_dock_stbd" + master_tag = "airlock_dominian_science_dock_stbd" + +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_dominian_science_dock_aft" + master_tag = "airlock_dominian_science_dock_aft" + //shuttle stuff /obj/effect/overmap/visitable/ship/landable/dominian_science_shuttle name = "Dominian Science Shuttle" diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index efdaf2fcc2e..70c4da5bc5f 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -41,14 +41,12 @@ /obj/machinery/door/airlock/external{ dir = 2 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "ans" = ( @@ -268,11 +266,6 @@ /area/ship/dominian_science_vessel/hangar) "aLz" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 22; @@ -280,6 +273,7 @@ pixel_y = -28 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "aMc" = ( @@ -388,9 +382,6 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/mess) "aZo" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; pixel_y = 6; @@ -400,6 +391,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "bac" = ( @@ -631,6 +623,7 @@ icon_state = "tube_empty" }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "bSl" = ( @@ -1078,9 +1071,6 @@ /obj/machinery/door/airlock/external{ dir = 2 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -20; @@ -1091,15 +1081,13 @@ dir = 6 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "dol" = ( /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "starboardext" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -12; @@ -1109,6 +1097,10 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/shuttle_landmark/dominian_science_vessel/dock/stbd{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "doM" = ( @@ -1425,15 +1417,13 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; pixel_y = 6; pixel_x = 20 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "etL" = ( @@ -1736,11 +1726,6 @@ /obj/effect/shuttle_landmark/dominian_science_vessel/dock/port{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 12; @@ -1750,6 +1735,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "fii" = ( @@ -2264,15 +2250,13 @@ /obj/machinery/door/airlock/external{ dir = 2 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -28; pixel_y = -28 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hgc" = ( @@ -2287,9 +2271,6 @@ /area/ship/dominian_science_vessel/research) "hhf" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -28; @@ -2299,6 +2280,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "hlW" = ( @@ -2456,11 +2438,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 12; @@ -2470,6 +2447,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hHN" = ( @@ -2540,11 +2518,6 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/atmospherics) "hMa" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, @@ -2553,12 +2526,10 @@ dir = 4; pixel_y = 6 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "hOQ" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/machinery/airlock_sensor{ pixel_x = -20; dir = 4; @@ -2572,6 +2543,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "hWr" = ( @@ -2656,9 +2628,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "starboardext" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 28; @@ -2669,6 +2638,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "iio" = ( @@ -2942,9 +2912,6 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "iZU" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "starboardext" - }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ pixel_y = 26 }, @@ -2952,6 +2919,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "jeW" = ( @@ -3025,11 +2993,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -28; @@ -3042,6 +3005,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "jwB" = ( @@ -3186,17 +3150,13 @@ /turf/simulated/wall/shuttle, /area/shuttle/dominian_science_shuttle) "ken" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "kfu" = ( @@ -3245,11 +3205,6 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/officer) "knD" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/machinery/airlock_sensor{ dir = 2; pixel_y = 20; @@ -3259,6 +3214,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "knI" = ( @@ -3604,9 +3560,6 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/port_hall) "lwX" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/machinery/airlock_sensor{ pixel_x = -20; dir = 4; @@ -3620,6 +3573,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "lxi" = ( @@ -3755,11 +3709,6 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/officer) "mgh" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ pixel_y = 20 }, @@ -3769,6 +3718,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "mit" = ( @@ -3985,9 +3935,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "starboardext" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -12; @@ -3997,6 +3944,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "mWV" = ( @@ -4511,15 +4459,13 @@ /area/ship/dominian_science_vessel/showers) "oCX" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -28; dir = 2 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "oDy" = ( @@ -4545,11 +4491,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -24; @@ -4558,6 +4499,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "oGe" = ( @@ -4698,11 +4640,6 @@ /area/ship/dominian_science_vessel/armory) "pfq" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/access_button{ @@ -4710,6 +4647,7 @@ dir = 2 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "pfE" = ( @@ -4769,15 +4707,13 @@ /area/ship/dominian_science_vessel/research) "pub" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28; dir = 2 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "puI" = ( @@ -4827,9 +4763,6 @@ /area/ship/dominian_science_vessel/research) "pDc" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "shipexterior" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 28; @@ -4839,6 +4772,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/stbd_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/armory) "pKo" = ( @@ -5582,12 +5516,8 @@ /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "sBG" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "sFQ" = ( @@ -5833,11 +5763,6 @@ /area/ship/dominian_science_vessel/center_hall) "trE" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28; @@ -5845,6 +5770,7 @@ pixel_y = 12 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "trF" = ( @@ -5885,15 +5811,11 @@ /turf/space, /area/ship/dominian_science_vessel/exterior) "ttW" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_port"; - landmark_tag = "nav_dominian_science_dock_port"; - name = "airlock_dominian_science_dock_port" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/port, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "tuK" = ( @@ -6142,14 +6064,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) "uwQ" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uAj" = ( @@ -6213,9 +6131,6 @@ /obj/machinery/door/airlock/external{ dir = 2 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "portext" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 20; @@ -6226,6 +6141,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/dominian_science_vessel/port_fore, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/port_hall) "uEm" = ( @@ -6258,9 +6174,6 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "starboardext" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 28; @@ -6273,6 +6186,7 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "uJi" = ( @@ -6829,17 +6743,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "wDo" = ( -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; pixel_x = 19 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "wGu" = ( @@ -6928,11 +6838,6 @@ /area/ship/dominian_science_vessel/starboard_hall) "wPk" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock/docking{ - master_tag = "airlock_dominian_science_dock_aft"; - landmark_tag = "nav_dominian_science_dock_aft"; - name = "airlock_dominian_science_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -28; @@ -6941,6 +6846,7 @@ }, /obj/effect/shuttle_landmark/dominian_science_vessel/dock/aft, /obj/effect/floor_decal/industrial/hatch_door/red, +/obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/aft, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "wPB" = ( From fbb82dd40dc6521c35f4aab39b1df1e0db4b9a94 Mon Sep 17 00:00:00 2001 From: Joshie Date: Wed, 6 Nov 2024 17:43:53 +1100 Subject: [PATCH 5/6] Console Adjustment --- .../dominia/dominian_science_vessel/dominian_science_vessel.dm | 2 +- .../dominia/dominian_science_vessel/dominian_science_vessel.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm index 8c7f201ea22..e89070570ed 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm @@ -159,7 +159,7 @@ fore_dir = NORTH vessel_size = SHIP_SIZE_TINY -/obj/machinery/computer/shuttle_control/explore/dominian_science_shuttle +/obj/machinery/computer/shuttle_control/explore/terminal/dominian_science_shuttle name = "shuttle control console" shuttle_tag = "Dominian Science Shuttle" req_access = list(ACCESS_HOUSE_VOLVALAAD_SHIP) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index b3518029e5c..00de4a4ce54 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -5108,7 +5108,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/machinery/computer/shuttle_control/explore/dominian_science_shuttle{ +/obj/machinery/computer/shuttle_control/explore/terminal/dominian_science_shuttle{ dir = 4 }, /turf/simulated/floor/tiled/dark, From e267d1c63622fb43a587f3944eac1dff13a8d95e Mon Sep 17 00:00:00 2001 From: Joshie Date: Tue, 19 Nov 2024 15:04:49 +1100 Subject: [PATCH 6/6] Docking Marker --- .../dominian_science_vessel/dominian_science_vessel.dm | 2 -- .../dominian_science_vessel/dominian_science_vessel.dmm | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm index e89070570ed..8215b62160d 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dm @@ -109,12 +109,10 @@ /obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_1 name = "Dock, Fore Port 1" landmark_tag = "nav_dominian_science_dock_fore_1" - docking_controller = "airlock_dominian_science_dock_fore_1" /obj/effect/shuttle_landmark/dominian_science_vessel/dock/fore_2 name = "Dock, Fore Port 2" landmark_tag = "nav_dominian_science_dock_fore_2" - docking_controller = "airlock_dominian_science_dock_fore_2" //airlocks diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index 00de4a4ce54..bae23163426 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -2906,14 +2906,14 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "iZU" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - pixel_y = 26 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/map_effect/marker/airlock/docking/dominian_science_vessel/dock/stbd, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + pixel_y = 20 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_science_vessel/aft_dock) "jeW" = (