diff --git a/code/modules/maps/overmap/space/centcom.dm b/code/modules/maps/overmap/space/centcom.dm index 2a5ac0617f5..58fd0612eed 100644 --- a/code/modules/maps/overmap/space/centcom.dm +++ b/code/modules/maps/overmap/space/centcom.dm @@ -1,4 +1,4 @@ -//Overmap Controller +//Atlas Overmap Controller /obj/overmap/entity/visitable/sector/centcom name = "NTS Demeter" desc = "The only NanoTrasen-owned orbital body in Lythios. The NTS Demeter was constructed via prefab by Nanotrasen and is used as a midpoint for sorting cargo, transferring crew to the NSB Atlas, as homes for local employees in the residential areas, and as orbital oversight for early threat detection. Very few Central Command Officers are present here at all times, and even fewer are the defensive capabilities that are reserved primarily for the inhabitants." @@ -33,6 +33,20 @@ start_y = pick(8, 9, 11, 12) */ +/obj/overmap/entity/visitable/sector/centcom_triumph + name = "NDV Marksman" + desc = "The NDV Marksman is a NanoTrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet." + scanner_desc = @{"[i]Information[/i]: The NDV Marksman is a NanoTrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."} + in_space = 1 + known = TRUE + icon = 'icons/modules/overmap/tiled.dmi' + icon_state = "fleet" + color = "#007396" + + initial_restricted_waypoints = list( + "NDV Quicksilver" = list("specops_hangar") + ) + /obj/landmark/map_data/centcom height = 1 @@ -40,10 +54,10 @@ // EXCLUSIVE NAV POINT FOR DOCKING INSIDE (ERT SHUTTLE ONLY) /obj/effect/shuttle_landmark/specops/hangar - name = "NTS Demeter Hangar" + name = "NT Special Operations Hangar" landmark_tag = "specops_hangar" docking_controller = "specops_hangar_dock" - base_turf = /turf/simulated/floor/reinforced + base_turf = /turf/simulated/floor/tiled/techfloor/grid base_area = /area/centcom/specops/dock //ERT Cryo diff --git a/code/modules/maps/overmap/space/triumph/triumph.dm b/code/modules/maps/overmap/space/triumph/triumph.dm index 86f73d805bd..4cf7b5cad25 100644 --- a/code/modules/maps/overmap/space/triumph/triumph.dm +++ b/code/modules/maps/overmap/space/triumph/triumph.dm @@ -22,5 +22,6 @@ "Civilian Transport" = list("triumph_civvie_home"), "Dart EMT Shuttle" = list("triumph_emt_dock"), "Beruang Trade Ship" = list("triumph_annex_dock"), - "Mining Shuttle" = list("triumph_mining_port") + "Mining Shuttle" = list("triumph_mining_port"), + "NDV Quicksilver" = list("triumph_specops_dock") ) diff --git a/code/modules/maps/templates/misc_presets/triumph_shuttle_landmarks.dm b/code/modules/maps/templates/misc_presets/triumph_shuttle_landmarks.dm index 29a50c8326b..f64b71deb24 100644 --- a/code/modules/maps/templates/misc_presets/triumph_shuttle_landmarks.dm +++ b/code/modules/maps/templates/misc_presets/triumph_shuttle_landmarks.dm @@ -30,6 +30,13 @@ right now its not a big priority - Bloop 2022 base_turf = /turf/space base_area = /area/space +/obj/effect/shuttle_landmark/triumph/deck4/specops + name = "NSV Triumph - Special Operations Dock" + landmark_tag = "triumph_specops_dock" + docking_controller = "triumph_specops_dock" + base_turf = /turf/space + base_area = /area/space + /obj/effect/shuttle_landmark/triumph/deck3/emt name = "NSV Triumph - EMT Shuttle Dock" landmark_tag = "triumph_emt_dock" @@ -46,6 +53,7 @@ right now its not a big priority - Bloop 2022 /obj/effect/shuttle_landmark/triumph/deck2/trade name = "NSV Triumph Annex Dock" landmark_tag = "triumph_annex_dock" + docking_controller = "triumph_annex_dock" base_turf = /turf/space base_area = /area/space diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index c879eccb593..b5e47625a36 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -3078,11 +3078,7 @@ /turf/simulated/floor/holofloor/reinforced, /area/space) "jM" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(103) - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/cockpit) "jN" = ( @@ -4354,16 +4350,17 @@ /turf/simulated/floor/tiled, /area/centcom/simulated/terminal) "nl" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = "specops_docker_pump" - }, /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/turretid/lethal{ control_area = /area/shuttle/specops/general; pixel_y = 32; req_access = list(103) }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "specops_docker_pump"; + power_rating = 20000 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "np" = ( @@ -7786,7 +7783,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "De" = ( /obj/structure/table/reinforced, @@ -7881,17 +7878,18 @@ /turf/simulated/floor/tiled/white, /area/holodeck/source_chess) "DO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "specops_docker_pump" - }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "specops_docker"; pixel_x = -25 }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "specops_docker_pump"; + power_rating = 20000 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "DR" = ( @@ -7961,7 +7959,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "EC" = ( /obj/machinery/vending/tool, @@ -8674,11 +8672,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor{ - req_one_access = list(103) - }, -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/specops/engine) "MJ" = ( @@ -8949,7 +8943,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "Qs" = ( /obj/structure/table/reinforced, @@ -9081,7 +9075,7 @@ /turf/unsimulated/floor/wood, /area/centcom/specops) "RY" = ( -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "Sc" = ( /obj/structure/closet/crate/medical, @@ -9210,7 +9204,7 @@ pixel_y = 28; req_one_access = list(103) }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "Tr" = ( /obj/structure/table/rack, @@ -9302,7 +9296,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/techfloor/grid, /area/centcom/specops/dock) "Ug" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -29608,8 +29602,8 @@ Bv ss Cw Cw -Ay Cw +Ay Cw Cw Cw diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index c86fe5a9cb9..86dc404d241 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -17000,9 +17000,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "YS" = ( -/obj/effect/shuttle_landmark/triumph/deck2/trade{ - docking_controller = null - }, +/obj/effect/shuttle_landmark/triumph/deck2/trade, /turf/space, /area/space) "YT" = ( diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 332922c9c97..9be111b180d 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -1047,6 +1047,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "aIs" = ( @@ -3331,9 +3334,7 @@ /area/shuttle/civvie/general) "clX" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "cmM" = ( @@ -3838,9 +3839,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -4541,17 +4539,9 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/security/starboard) "dfU" = ( -/obj/machinery/shield_diffuser, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external, -/obj/machinery/access_button/airlock_exterior{ - dir = 8; - frequency = 1380; - master_tag = "deck4_airlock"; - pixel_y = 24 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) +/obj/effect/shuttle_landmark/triumph/deck4/specops, +/turf/space, +/area/space) "dgm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4910,11 +4900,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/lobby) -"doe" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) "dos" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/shuttle/engine/heater{ @@ -4997,6 +4982,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "dqb" = ( @@ -6241,6 +6229,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "ebJ" = ( @@ -6879,6 +6870,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "eFE" = ( @@ -8671,9 +8665,6 @@ /area/maintenance/chapel) "fSC" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -11059,9 +11050,6 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "hvx" = ( @@ -14131,6 +14119,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "jAg" = ( @@ -14972,13 +14963,11 @@ "kaO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /obj/effect/floor_decal/techfloor/orange, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "kaV" = ( @@ -15696,26 +15685,8 @@ /turf/simulated/floor/tiled, /area/security/range) "kAO" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "deck4_airlock"; - pixel_x = 1; - pixel_y = 26 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "deck4_airlock_pump" - }, -/obj/machinery/airlock_sensor{ - dir = 1; - frequency = 1380; - id_tag = "deck4_airlock"; - pixel_y = -22 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/sign/a, +/turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway) "kAU" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -18612,6 +18583,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "mId" = ( @@ -19585,11 +19559,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/lawoffice) "nuU" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/shield_diffuser, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external, +/obj/machinery/access_button/airlock_exterior{ + dir = 8; + frequency = 1380; + master_tag = "triumph_specops_dock"; + pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -22082,7 +22059,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "pcl" = ( @@ -23446,13 +23423,6 @@ }, /turf/simulated/floor/wood/broken, /area/vacant/vacant_bar) -"pWv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/orange, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) "pWM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24150,8 +24120,26 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/hallway/primary/aft) "qzd" = ( -/turf/space, -/area/shuttle/specops/station) +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1380; + id_tag = "triumph_specops_dock_pump" + }, +/obj/machinery/airlock_sensor{ + dir = 1; + frequency = 1380; + id_tag = "triumph_specops_dock"; + pixel_y = -22 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "triumph_specops_dock"; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway) "qzh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27901,6 +27889,16 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) +"tps" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway) "tpH" = ( /obj/machinery/light/small{ dir = 4 @@ -28131,8 +28129,21 @@ /turf/simulated/floor/plating, /area/crew_quarters/lounge) "txV" = ( -/obj/effect/floor_decal/sign/a, -/turf/simulated/wall/r_wall/prepainted, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external, +/obj/machinery/access_button/airlock_interior{ + dir = 4; + frequency = 1380; + master_tag = "triumph_specops_dock"; + pixel_y = 24 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "tyc" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -29340,19 +29351,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/sleep/CE_quarters) "unu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external, -/obj/machinery/access_button/airlock_interior{ - dir = 4; - frequency = 1380; - master_tag = "deck4_airlock"; - pixel_y = 24 - }, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -31236,9 +31239,6 @@ /area/exploration/excursion_dock) "vEi" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -31677,9 +31677,6 @@ /area/medical/patient_wing) "vTi" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "vTv" = ( @@ -32683,12 +32680,12 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "wDH" = ( @@ -33471,9 +33468,6 @@ /area/hydroponics/garden) "xfQ" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -33828,9 +33822,8 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/station_map{ - dir = 4; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -35020,17 +35013,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) -"ycU" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) "ycW" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -53096,11 +53078,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg tCX uaF gjr @@ -53290,11 +53272,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg uaF wzg @@ -53484,11 +53466,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg uaF dNq @@ -53678,11 +53660,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg uaF oFx @@ -53872,11 +53854,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg uaF nTf @@ -54066,11 +54048,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg uaF uaF @@ -54260,11 +54242,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg jNg jNg @@ -54445,20 +54427,20 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg vTv jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg jNg jNg jNg @@ -54648,11 +54630,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg jNg jNg @@ -54842,11 +54824,11 @@ jNg jNg jNg jNg -qzd -qzd -qzd -qzd -qzd +jNg +jNg +jNg +jNg +jNg jNg jNg jNg @@ -55033,14 +55015,14 @@ jNg jNg jNg jNg +dfU jNg jNg +xRj +xRj +xRj +jNg jNg -qzd -qzd -qzd -qzd -qzd jNg jNg jNg @@ -55231,9 +55213,9 @@ jNg jNg jNg jNg -qzd -qzd -qzd +jNg +jNg +jNg jNg jNg jNg @@ -55421,14 +55403,14 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg wBM -dfU +nuU wBM jNg +xRj +xRj +xRj +jNg jNg jNg jNg @@ -55615,14 +55597,14 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg wBM -kAO +qzd wBM jNg +xRj +xRj +xRj +jNg jNg jNg jNg @@ -55809,12 +55791,12 @@ jNg jNg jNg wBM -wBM -wBM -wBM -wBM +kAO txV -unu +wBM +wBM +wBM +wBM wBM wBM wBM @@ -56008,7 +55990,7 @@ xnh xYB kjd fVJ -nuU +tps saW yjV pst @@ -56202,7 +56184,7 @@ aIl kaO rLM fUK -ycU +mwp gLA boL mwp @@ -56393,7 +56375,7 @@ wBM wBM qik jAa -pWv +vTi wtM dQJ mMT @@ -56587,7 +56569,7 @@ fUM tyc cqc pbY -doe +vTi wBM wBM wBM @@ -59496,7 +59478,7 @@ jNg jNg yfo hja -dpS +unu clX tkc qQg diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 588d276a857..7b25b510801 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -69,13 +69,12 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -95,10 +94,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun/combat, +/obj/item/gun/energy/gun/combat, +/obj/item/gun/energy/gun/combat, +/obj/item/gun/energy/gun/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -172,6 +171,9 @@ icon_state = "white" }, /area/centcom/medical) +"aG" = ( +/turf/unsimulated/wall, +/area/centcom/specops/dock) "aH" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloorblack{ @@ -285,14 +287,6 @@ icon_state = "dark" }, /area/centcom/specops) -"aW" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/unsimulated/floor/techfloor_grid, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom) "aX" = ( /obj/structure/bed/padded, /obj/item/bedsheet/orange, @@ -662,6 +656,12 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"cf" = ( +/obj/machinery/door/blast/regular{ + dir = 4 + }, +/turf/unsimulated/wall, +/area/centcom/specops/dock) "cg" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -669,18 +669,6 @@ /obj/structure/railing, /turf/unsimulated/floor/steel, /area/centcom/evac) -"ch" = ( -/obj/machinery/computer/security/telescreen{ - desc = ""; - name = "Spec. Ops. Monitor"; - network = list("NETWORK_ERT"); - pixel_y = 30 - }, -/obj/machinery/computer/specops_shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "cl" = ( /obj/structure/bed/padded, /obj/item/bedsheet/orange, @@ -1166,6 +1154,10 @@ /obj/structure/bed/padded, /turf/simulated/shuttle/floor, /area/shuttle/escape) +"dy" = ( +/obj/overmap/entity/visitable/sector/centcom_triumph, +/turf/space, +/area/space) "dz" = ( /obj/effect/floor_decal/rust/steel_decals_rusted2, /obj/effect/floor_decal/industrial/warning/dust, @@ -1307,6 +1299,10 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/control) +"dY" = ( +/obj/machinery/porta_turret, +/turf/simulated/floor/plating, +/area/shuttle/specops/general) "dZ" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-21" @@ -1514,6 +1510,9 @@ }, /turf/unsimulated/floor/steel, /area/centcom/command) +"ez" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/specops/general) "eB" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -1568,6 +1567,9 @@ icon_state = "white" }, /area/centcom/control) +"eZ" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/general) "fe" = ( /obj/structure/bed/chair{ dir = 8 @@ -1714,6 +1716,14 @@ /obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/bar) +"fC" = ( +/obj/machinery/porta_turret, +/obj/machinery/flasher{ + id = "breach_flash"; + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/general) "fD" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ @@ -1760,18 +1770,8 @@ }, /area/centcom/security) "fF" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "marksman_corporate_dock"; - name = "docking port controller"; - pixel_y = 25; - req_one_access = list(103); - tag_door = "specops_centcom_dock_door" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/specops) +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/engine) "fG" = ( /obj/structure/table/reinforced, /obj/item/perfect_tele, @@ -2105,6 +2105,9 @@ /obj/item/reagent_containers/food/snacks/pastatomato, /turf/unsimulated/floor/wood, /area/centcom/restaurant) +"gt" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/specops/engine) "gu" = ( /obj/machinery/shower{ dir = 4 @@ -2208,6 +2211,18 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"gK" = ( +/obj/structure/table/rack/steel, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "gL" = ( /obj/structure/bed/padded, /obj/machinery/camera/network/crescent, @@ -2447,6 +2462,11 @@ /obj/machinery/telecomms/hub/preset_cent, /turf/unsimulated/floor/steel, /area/centcom/control) +"hF" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "hH" = ( /obj/machinery/telecomms/bus/preset_cent, /turf/unsimulated/floor{ @@ -2488,6 +2508,12 @@ }, /turf/unsimulated/floor/wood, /area/centcom/specops) +"hS" = ( +/obj/machinery/atmospherics/component/unary/engine{ + dir = 4 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/specops/engine) "hU" = ( /obj/machinery/gibber, /turf/unsimulated/floor/steel{ @@ -2704,24 +2730,6 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) -"iS" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/machinery/vending/wallmed1{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/bed/chair, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "iT" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -2894,6 +2902,15 @@ icon_state = "white" }, /area/centcom/medical) +"jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/engine) "ju" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -2967,6 +2984,13 @@ icon_state = "dark" }, /area/centcom/security) +"jH" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "jI" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -3001,6 +3025,15 @@ }, /turf/unsimulated/floor/steel, /area/centcom/living) +"jO" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "jP" = ( /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -3041,13 +3074,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/unsimulated/floor/steel, /area/centcom/evac) -"ka" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 - }, -/turf/unsimulated/floor/techfloor_grid, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom) "kb" = ( /obj/machinery/door/airlock{ name = "Unit 1" @@ -3330,6 +3356,13 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"kW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "kY" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/borderfloor/corner2{ @@ -3568,6 +3601,12 @@ icon_state = "white" }, /area/centcom/control) +"lF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "lG" = ( /obj/machinery/computer/pod{ id = "thunderdomehea"; @@ -4146,6 +4185,17 @@ }, /turf/unsimulated/floor/wood, /area/centcom/restaurant) +"nm" = ( +/obj/machinery/vending/wallmed1{ + layer = 3.3; + name = "Emergency NanoMed"; + pixel_y = 30 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "nn" = ( /obj/machinery/vending/boozeomat, /turf/unsimulated/floor/wood, @@ -4386,11 +4436,14 @@ "nV" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/ballistic/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, +/obj/item/silencer, +/obj/item/silencer, +/obj/item/silencer, +/obj/item/silencer, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -4410,6 +4463,17 @@ icon_state = "white" }, /area/centcom/control) +"oa" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "ob" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -4524,17 +4588,6 @@ icon_state = "white" }, /area/centcom/bathroom) -"ov" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "ox" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -4561,6 +4614,14 @@ }, /turf/unsimulated/floor/steel, /area/centcom/command) +"oB" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "oE" = ( /obj/machinery/vending/cola, /obj/effect/floor_decal/corner/yellow/diagonal, @@ -4760,18 +4821,17 @@ icon_state = "white" }, /area/centcom/medical) -"pu" = ( -/obj/machinery/computer/communications, -/obj/item/radio/intercom{ - dir = 1; - frequency = 1443; - name = "Spec Ops Intercom"; - pixel_y = -28 +"pt" = ( +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, -/area/shuttle/specops/centcom) +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "pv" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, @@ -4917,6 +4977,12 @@ /obj/item/robotanalyzer, /turf/unsimulated/floor/steel, /area/centcom/control) +"pW" = ( +/obj/machinery/flasher{ + id = "breach_flash" + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/general) "pX" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/borderfloor{ @@ -5059,6 +5125,15 @@ icon_state = "white" }, /area/centcom/control) +"qq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/engine) "qr" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -5275,24 +5350,6 @@ icon_state = "dark" }, /area/centcom/security) -"rj" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "corporate_shuttle_port_hatch"; - name = "Port Docking Hatch" - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "marksman_corporate_docker"; - name = "port docking hatch controller"; - pixel_x = -25; - tag_door = "corporate_shuttle_port_hatch" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/shuttle/specops/centcom) "ro" = ( /obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/borderfloorblack{ @@ -5513,17 +5570,14 @@ /turf/unsimulated/floor/steel, /area/centcom/living) "rO" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "specops_shuttle_fore"; - name = "forward docking hatch controller"; - pixel_y = -25; - tag_door = "specops_shuttle_fore_hatch" +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" +/obj/machinery/computer/ship/engines{ + dir = 4 }, -/area/shuttle/specops/centcom) +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "rR" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/floor_decal/borderfloorwhite{ @@ -5674,12 +5728,7 @@ }, /area/centcom/security) "sk" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "specops_centcom_dock_door"; - locked = 1 - }, +/obj/machinery/cryopod/robot/door/travel/specops, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -5753,6 +5802,31 @@ icon_state = "dark" }, /area/centcom/command) +"ss" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) +"st" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + name = "Engine Bay"; + req_one_access = list(103) + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "sw" = ( /obj/machinery/computer/med_data, /obj/effect/floor_decal/borderfloorwhite{ @@ -5835,10 +5909,10 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/combat, +/obj/item/gun/energy/combat, +/obj/item/gun/energy/combat, +/obj/item/gun/energy/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -5910,6 +5984,18 @@ icon_state = "dark" }, /area/centcom/security) +"sQ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "sR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6222,6 +6308,15 @@ icon_state = "white" }, /area/centcom/control) +"tZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "ue" = ( /obj/structure/table/reinforced, /obj/item/cell/hyper, @@ -6369,6 +6464,21 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"uE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen{ + desc = ""; + name = "Spec. Ops. Monitor"; + network = list("NETWORK_ERT"); + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "uF" = ( /obj/structure/table/standard, /obj/item/surgical/surgicaldrill, @@ -6405,6 +6515,18 @@ icon_state = "white" }, /area/centcom/medical) +"uJ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "uK" = ( /obj/machinery/vending/wallmed1{ pixel_y = -32 @@ -6485,6 +6607,15 @@ "vc" = ( /turf/unsimulated/floor/steel, /area/centcom/evac) +"ve" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "vi" = ( /obj/machinery/power/port_gen/pacman, /turf/unsimulated/floor{ @@ -6903,12 +7034,6 @@ icon_state = "steel" }, /area/centcom/bathroom) -"ww" = ( -/obj/structure/bed/chair, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "wy" = ( /obj/item/megaphone, /obj/item/storage/box/trackimp, @@ -7046,6 +7171,27 @@ icon_state = "white" }, /area/centcom/medical) +"wP" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/alarms_hidden/east_bump, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) +"wQ" = ( +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/turretid/lethal{ + control_area = /area/shuttle/specops/general; + pixel_y = 32; + req_access = list(103) + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "specops_docker_pump"; + power_rating = 20000 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "wR" = ( /obj/item/stock_parts/console_screen, /obj/structure/table/standard, @@ -7730,15 +7876,17 @@ }, /area/centcom/specops) "zi" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "specops_shuttle_fore_hatch"; - locked = 1; - name = "Forward Docking Hatch" +/obj/overmap/entity/visitable/ship/landable/specops, +/obj/machinery/button/flasher{ + id = "breach_flash"; + pixel_y = 26 }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops/centcom) +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/shuttle_landmark/shuttle_initializer/specops, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "zk" = ( /obj/item/handcuffs/legcuffs/fuzzy, /obj/item/handcuffs/legcuffs/fuzzy, @@ -7904,6 +8052,16 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"zO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "zP" = ( /obj/structure/morgue{ dir = 8 @@ -8345,11 +8503,6 @@ icon_state = "dark" }, /area/centcom/specops) -"Bg" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "Bh" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -8486,17 +8639,6 @@ icon_state = "white" }, /area/centcom/medical) -"BH" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "corporate_shuttle_port_hatch"; - name = "Port Docking Hatch" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/shuttle/specops/centcom) "BJ" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 @@ -8719,6 +8861,24 @@ icon_state = "white" }, /area/centcom/control) +"CB" = ( +/obj/structure/cable/green, +/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) +"CC" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/hatch{ + name = "Cockpit"; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "CD" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/glass_external{ @@ -9093,6 +9253,9 @@ /obj/structure/sign/department/eva, /turf/unsimulated/wall, /area/centcom/security) +"DV" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/specops/cockpit) "DX" = ( /obj/effect/floor_decal/spline/fancy/wood, /turf/unsimulated/floor/steel, @@ -9195,14 +9358,6 @@ icon_state = "white" }, /area/centcom/medical) -"Eo" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "Ep" = ( /obj/structure/table/rack, /obj/item/storage/box/frags, @@ -9291,6 +9446,11 @@ icon_state = "white" }, /area/centcom/control) +"EH" = ( +/obj/machinery/mech_recharger, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "EI" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, @@ -9386,8 +9546,11 @@ }, /area/centcom/medical) "ET" = ( -/turf/unsimulated/floor/techfloor_grid, -/area/centcom/specops) +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "EX" = ( /obj/landmark{ name = "tdome2" @@ -9399,6 +9562,15 @@ icon_state = "dark" }, /area/tdome/tdome1) +"EY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "EZ" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, @@ -9637,6 +9809,15 @@ icon_state = "carpet" }, /area/centcom/command) +"FN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "FQ" = ( /obj/machinery/porta_turret/crescent{ density = 1 @@ -9841,6 +10022,27 @@ icon_state = "white" }, /area/tdome/tdomeobserve) +"GB" = ( +/obj/machinery/access_button/airlock_interior{ + dir = 8; + frequency = 1380; + master_tag = "specops_docker"; + pixel_x = -8; + pixel_y = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + name = "Ship Hatch" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "GC" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10124,6 +10326,15 @@ icon_state = "white" }, /area/centcom/medical) +"HI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "HN" = ( /obj/spawner/window/low_wall/reinforced/full, /turf/unsimulated/floor{ @@ -10295,6 +10506,24 @@ icon_state = "dark" }, /area/centcom/specops) +"Ig" = ( +/obj/machinery/access_button/airlock_exterior{ + dir = 4; + frequency = 1380; + master_tag = "specops_docker"; + pixel_x = 8; + pixel_y = 26 + }, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + name = "Ship Hatch" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Ih" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -10546,6 +10775,12 @@ icon_state = "white" }, /area/centcom/medical) +"IT" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/specops/dock) "IW" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/floor_decal/carpet{ @@ -10581,6 +10816,13 @@ icon_state = "dark" }, /area/centcom/specops) +"Ja" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/engine) "Jb" = ( /obj/item/circuitboard/aiupload, /obj/item/circuitboard/borgupload, @@ -10632,11 +10874,12 @@ }, /area/centcom/command) "Jl" = ( -/turf/simulated/shuttle/wall/dark{ - hard_corner = 1; - join_group = "shuttle_ert" +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, -/area/shuttle/specops/centcom) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "Jm" = ( /obj/structure/table/rack, /obj/item/hardsuit_module/mounted, @@ -10923,14 +11166,6 @@ icon_state = "dark" }, /area/centcom/control) -"Kf" = ( -/obj/machinery/computer/prisoner{ - name = "Implant Management" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "Kg" = ( /obj/machinery/door/airlock/command, /turf/simulated/shuttle/floor/white, @@ -11065,6 +11300,17 @@ icon_state = "dark" }, /area/centcom/specops) +"KC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/structure/fuel_port{ + dir = 4; + pixel_x = 29 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "KD" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 @@ -11148,15 +11394,19 @@ icon_state = "white" }, /area/centcom/control) +"KN" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "KO" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/computer/shuttle_control/explore/specops{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating/airless, -/area/shuttle/specops/centcom) +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "KP" = ( /obj/effect/floor_decal/carpet, /turf/unsimulated/floor{ @@ -11353,6 +11603,10 @@ icon_state = "white" }, /area/centcom/control) +"Lw" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/specops/cockpit) "Lx" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/unsimulated/floor{ @@ -11548,6 +11802,10 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"Mb" = ( +/obj/machinery/holopad/ship/starts_inactive, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Md" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11566,6 +11824,9 @@ /obj/structure/table/bench/wooden, /turf/unsimulated/floor/wood, /area/centcom/main_hall) +"Mg" = ( +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Mh" = ( /obj/machinery/fitness/heavy/lifter, /turf/unsimulated/floor{ @@ -11837,6 +12098,21 @@ icon_state = "steel" }, /area/centcom/bathroom) +"MS" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "specops_docker"; + pixel_x = -25 + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "specops_docker_pump"; + power_rating = 20000 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "MT" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 @@ -11870,6 +12146,19 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"Nd" = ( +/obj/machinery/airlock_sensor{ + dir = 1; + frequency = 1380; + id_tag = "specops_docker"; + pixel_y = -32 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Ne" = ( /obj/machinery/vending/medical, /obj/machinery/light{ @@ -12359,6 +12648,20 @@ icon_state = "dark" }, /area/centcom/specops) +"OJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/specops/dock) +"OL" = ( +/obj/machinery/computer/cryopod/ert{ + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) "OM" = ( /obj/structure/table/reinforced, /obj/item/healthanalyzer/advanced, @@ -12387,6 +12690,9 @@ icon_state = "dark" }, /area/centcom/security) +"OR" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/specops/dock) "OU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -12421,6 +12727,15 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/unsimulated/floor/steel, /area/centcom/evac) +"Pd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/specops/engine) "Pj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -12441,6 +12756,13 @@ "Pk" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/centcom/control) +"Pm" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "Pn" = ( /obj/machinery/light{ dir = 4; @@ -12649,17 +12971,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/unsimulated/floor/steel, /area/centcom/security) -"PK" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) "PM" = ( /obj/structure/closet/l3closet/virology, /obj/item/clothing/mask/gas, @@ -12935,6 +13246,14 @@ icon_state = "dark" }, /area/centcom/specops) +"QA" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/shuttle/specops/engine) "QC" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -12943,6 +13262,26 @@ icon_state = "carpet" }, /area/centcom/control) +"QD" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/turretid/lethal{ + control_area = /area/shuttle/specops/general; + pixel_x = -32; + req_access = list(103) + }, +/obj/machinery/button/flasher{ + dir = 4; + id = "breach_flash"; + pixel_x = -24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "QE" = ( /obj/structure/table/woodentable, /obj/machinery/cash_register/civilian, @@ -13048,6 +13387,13 @@ icon_state = "dark" }, /area/centcom/specops) +"QZ" = ( +/obj/machinery/computer/ship/helm{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "Ra" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -13070,6 +13416,20 @@ icon_state = "white" }, /area/centcom/control) +"Rf" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) +"Rg" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = -32 + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Rh" = ( /obj/structure/bed/chair, /turf/unsimulated/floor/steel, @@ -13088,10 +13448,18 @@ /turf/unsimulated/floor/steel, /area/centcom/main_hall) "Rk" = ( -/turf/simulated/shuttle/wall/dark{ - join_group = "shuttle_ert" +/obj/machinery/light{ + dir = 4 }, -/area/shuttle/specops/centcom) +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = -32 + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/general) "Rl" = ( /obj/effect/floor_decal/corner_techfloor_grid, /turf/unsimulated/floor{ @@ -13262,6 +13630,17 @@ /obj/structure/closet/crate/bin, /turf/unsimulated/floor/wood, /area/centcom/restaurant) +"RL" = ( +/obj/item/radio/intercom{ + dir = 1; + frequency = 1443; + name = "Spec Ops Intercom"; + pixel_y = -28 + }, +/obj/structure/cable/green, +/obj/machinery/power/apc/alarms_hidden/west_bump, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "RN" = ( /obj/item/storage/box/evidence, /obj/item/folder/red, @@ -13839,6 +14218,16 @@ icon_state = "white" }, /area/tdome/tdomeobserve) +"TI" = ( +/obj/machinery/computer/ship/sensors{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/specops/cockpit) "TJ" = ( /obj/machinery/vending/snack, /turf/unsimulated/floor/wood, @@ -14278,6 +14667,15 @@ icon_state = "dark" }, /area/centcom/command) +"Vy" = ( +/obj/machinery/door/airlock/centcom{ + name = "SpecOps Hangar"; + req_access = list(103) + }, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops/dock) "Vz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -14343,7 +14741,14 @@ "VI" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/energy/sniperrifle, +/obj/item/ammo_magazine/m57x28mm/smg/ap, +/obj/item/ammo_magazine/m57x28mm/smg/ap, +/obj/item/ammo_magazine/m57x28mm/smg/ap, +/obj/item/ammo_magazine/m57x28mm/smg/ap, +/obj/item/gun/ballistic/automatic/combat, +/obj/item/gun/ballistic/automatic/combat, +/obj/item/gun/ballistic/automatic/combat, +/obj/item/gun/ballistic/automatic/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -14429,6 +14834,13 @@ icon_state = "dark" }, /area/centcom/security) +"VY" = ( +/obj/machinery/shipsensors{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/shuttle/specops/general) "Wb" = ( /obj/structure/table/reinforced, /obj/item/tape_recorder, @@ -14516,6 +14928,10 @@ icon_state = "dark" }, /area/centcom/security) +"Wt" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "Wu" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14643,6 +15059,16 @@ /obj/effect/floor_decal/corner/blue/border, /turf/unsimulated/floor/steel, /area/centcom/security) +"WW" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; + frequency = 1380; + id_tag = "specops_hangar_dock"; + pixel_y = -28; + req_one_access = list(103) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/specops/dock) "WX" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -14687,6 +15113,16 @@ }, /turf/unsimulated/floor/steel, /area/centcom/security) +"Xf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/hatch{ + name = "Power Management"; + req_one_access = list(103) + }, +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "Xg" = ( /obj/structure/sink{ dir = 8; @@ -15067,6 +15503,15 @@ icon_state = "freezerfloor" }, /area/centcom/bathroom) +"Yo" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "Yp" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 4 @@ -15087,13 +15532,9 @@ }, /area/centcom/control) "Yr" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/unsimulated/floor/techfloor_grid, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/specops/centcom) +/turf/space/basic, +/turf/unsimulated/wall, +/area/space) "Yt" = ( /obj/machinery/door/airlock/centcom{ name = "Commander"; @@ -15291,21 +15732,23 @@ icon_state = "carpet" }, /area/centcom/control) +"YJ" = ( +/obj/machinery/power/rtg/fake_gen, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "YK" = ( /obj/structure/railing, /obj/machinery/light/flamp/noshade, /turf/unsimulated/floor/steel, /area/centcom/evac) "YL" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/structure/bed/chair, -/turf/simulated/shuttle/floor{ - icon_state = "floor_red" - }, -/area/shuttle/specops/centcom) +/obj/structure/cable, +/obj/machinery/power/apc/alarms_hidden/south_bump, +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "YM" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas{ @@ -15454,6 +15897,9 @@ icon_state = "dark" }, /area/centcom/security) +"Ze" = ( +/turf/simulated/floor/plating, +/area/centcom/specops/dock) "Zf" = ( /obj/item/clothing/accessory/holster/armpit, /obj/item/clothing/accessory/holster/armpit, @@ -15552,6 +15998,10 @@ "Zs" = ( /turf/unsimulated/wall, /area/centcom/main_hall) +"Zv" = ( +/obj/effect/blocker, +/turf/simulated/floor/tiled/white, +/area/centcom/specops) "Zx" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/borderfloorwhite{ @@ -16077,7 +16527,7 @@ BP BP BP BP -BP +dy BP "} (3,1,1) = {" @@ -38808,20 +39258,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +aG +aG +aG +aG +aG +aG +aG +aG +aG +aG +aG +aG +aG +aG Ic Ic Ic @@ -39002,20 +39452,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +aG Ic Ic Ic @@ -39196,20 +39646,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +fF +hS +hS +hS +hS +hS +fF +OR +OR +OR +aG Ic Ic Ic @@ -39390,20 +39840,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +fF +jt +qq +qq +Ja +Pd +fF +OR +OR +OR +aG Ic Ic Ic @@ -39584,20 +40034,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +fF +jH +rO +zO +Jl +Pm +fF +OR +OR +OR +aG Ic Ic Ic @@ -39778,20 +40228,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +dY +fF +jO +ss +CB +KC +QA +fF +dY +OR +OR +aG Ic Ic Ic @@ -39972,20 +40422,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +ez +gt +kW +st +gt +fF +fF +gt +ez +OR +OR +aG Ic Ic Ic @@ -40166,20 +40616,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +eZ +gK +lF +sQ +CC +KN +QD +RL +eZ +OR +OR +aG Ic Ic Ic @@ -40360,20 +40810,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +eZ +hF +lF +tZ +DV +KO +QZ +TI +eZ +OR +WW +aG Ic Ic Ic @@ -40554,20 +41004,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +eZ +ez +nm +uE +DV +Lw +Lw +DV +ez +OR +OR +aG Ic Ic Ic @@ -40748,20 +41198,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +eZ +eZ +lF +tZ +EH +Mb +Rf +eZ +VY +OR +OR +aG Ic Ic Ic @@ -40942,20 +41392,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +ez +eZ +oa +uJ +ET +Mg +Rg +eZ +ez +OR +OR +aG Ic Ic Ic @@ -41136,20 +41586,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +fC +eZ +oB +ve +EY +Mg +Rg +eZ +fC +OR +OR +aG Ic Ic Zs @@ -41330,20 +41780,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +eZ +pt +wP +FN +Mg +Rk +eZ +OR +OR +OR +aG Ic Ic Zs @@ -41524,20 +41974,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +ez +eZ +ez +GB +ez +eZ +ez +OR +OR +OR +aG Ic Ic Zs @@ -41718,20 +42168,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +fC +eZ +wQ +HI +MS +eZ +fC +OR +OR +OR +aG Ic Ic Zs @@ -41912,20 +42362,20 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +OR +eZ +zi +lF +Nd +eZ +OR +OR +OR +OR +aG Ic Ic xa @@ -42106,23 +42556,23 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +OR +pW +ez +Ig +ez +pW +OR +OR +OR +OR +aG +aG +aG +aG xa eQ eQ @@ -42300,23 +42750,23 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +OR +OR +OR +IT +OJ +OJ +OJ +OJ +OJ +OJ +Xf +Yo +Yo +YL xa eQ eQ @@ -42494,23 +42944,23 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +cf +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +OR +aG +YJ +YJ +Ze xa eQ eQ @@ -42688,23 +43138,23 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic -Ic +aG +aG +aG +aG +aG +aG +aG +aG +aG +Vy +Wt +Vy +aG +aG +aG +aG +aG xa eQ eQ @@ -42890,11 +43340,11 @@ Ic Ic Ic Ic -Ic -Ic -Ic -Ic -Ic +xa +Nf +Nf +Nf +xa Ic Ic Ic @@ -43085,9 +43535,9 @@ xa xa xa xa -xa -xa -xa +Nf +Nf +Nf xa xa xa @@ -48120,8 +48570,8 @@ Ic Ic Ic Ic -xa -xa +Ic +Ic xa xa xa @@ -48314,12 +48764,12 @@ Ic Ic Ic Ic -GK -GK -xa -xa -xa -xa +Ic +Ic +Ic +Ic +Ic +Ic xa fn Pv @@ -48508,11 +48958,11 @@ Ic Ic Ic Ic -GK -aW -ka -ka -ka +Ic +Yr +Yr +Yr +Yr Yr xa kQ @@ -48702,12 +49152,12 @@ Ic Ic Ic Ic -GK -Rk -KO -KO -KO -Rk +Ic +Ic +Ic +Ic +Ic +Ic xa kQ nP @@ -48896,12 +49346,12 @@ Ic Ic Ic Ic -GK -Rk -ch -ov -pu -Rk +Ic +Ic +Ic +Ic +Ic +Ic xa kQ nP @@ -49090,12 +49540,12 @@ Ic Ic Ic Ic -GK -Rk -ww -Bg -Kf -Rk +Ic +Ic +Ic +Ic +Ic +Ic xa Sx Pv @@ -49284,12 +49734,12 @@ Ic Ic Ic Ic -GK -Rk -ww -Bg -Bg -Rk +Ic +Ic +Ic +Ic +xa +xa xa xa xa @@ -49478,12 +49928,12 @@ Ic Ic Ic Ic -GK -Rk -ww -Bg -Bg -rj +Ic +Ic +Ic +Ic +xa +Zv sk Nf Nf @@ -49672,14 +50122,14 @@ Ic Ic Ic Ic -GK -Rk -ww -Bg -Bg -BH -sk -Nf +Ic +Ic +Ic +Ic +xa +xa +xa +OL Nf Nf Nf @@ -49866,14 +50316,14 @@ Ic Ic Ic Ic -GK -Rk -ww -Bg -Eo -Rk +Ic +Ic +Ic +Ic xa -fF +Zv +sk +Nf Nf Nf Nf @@ -50060,12 +50510,12 @@ Ic Ic Ic Ic -GK -Rk -YL -Bg -Eo -Rk +Ic +Ic +Ic +Ic +xa +xa xa xa xa @@ -50254,12 +50704,12 @@ Ic Ic Ic Ic -GK -Rk -iS -Bg -PK -Rk +Ic +Ic +Ic +Ic +Ic +Ic xa xa wy @@ -50448,12 +50898,12 @@ Ic Ic Ic Ic -GK -Rk -Jl -rO -Jl -Rk +Ic +Ic +Ic +Ic +Ic +Ic xa xa VM @@ -50642,12 +51092,12 @@ Ic Ic Ic Ic -GK -ET -Rk -zi -Rk -ET +Ic +Ic +Ic +Ic +Ic +Ic xa xa LZ @@ -50836,12 +51286,12 @@ Ic Ic Ic Ic -GK -GK -GK -GK -GK -GK +Ic +Ic +Ic +Ic +Ic +Ic GK GK GK diff --git a/maps/triumph/levels/transit.dmm b/maps/triumph/levels/transit.dmm index 9df95572bd6..2e0e67c265c 100644 --- a/maps/triumph/levels/transit.dmm +++ b/maps/triumph/levels/transit.dmm @@ -127,6 +127,10 @@ /obj/effect/step_trigger/lost_in_space/shuttle, /turf/space/transit/west, /area/space) +"mT" = ( +/obj/effect/shuttle_landmark/transit/rift/specops, +/turf/space/transit/west, +/area/space) "ns" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, @@ -429,6 +433,10 @@ "PT" = ( /turf/simulated/floor/holofloor/reinforced, /area/houseboat/holodeck/off) +"PX" = ( +/obj/effect/step_trigger/lost_in_space, +/turf/space/transit/west, +/area/space) "Si" = ( /obj/effect/shuttle_landmark/transit/triumph/mining, /turf/space/transit/east, @@ -452,6 +460,9 @@ "Wy" = ( /turf/unsimulated/wall/seperator, /area/space) +"Xj" = ( +/turf/space/basic, +/area/space) "YW" = ( /turf/simulated/floor/holofloor/tiled, /area/houseboat/holodeck/thunderdome) @@ -9107,20 +9118,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +by +by +by +by +by +by +by +by +by +by +by +by +Wy rT rT rT @@ -9301,20 +9312,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +by +PX +PX +PX +PX +PX +PX +PX +PX +PX +by +by +Wy rT rT rT @@ -9495,20 +9506,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +by +PX +by +by +by +by +by +by +by +PX +by +by +Wy rT rT rT @@ -9689,20 +9700,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +by +PX +by +by +by +by +by +by +by +PX +by +by +Wy rT rT rT @@ -9883,20 +9894,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +PX +PX +by +by +by +by +by +by +by +PX +PX +by +Wy rT rT rT @@ -10077,20 +10088,20 @@ km km HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -10271,20 +10282,20 @@ HZ HZ HZ Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -10465,20 +10476,20 @@ Wy Wy Wy Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -10658,21 +10669,21 @@ HZ HZ jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -10852,21 +10863,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -11046,21 +11057,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -11240,21 +11251,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -11434,21 +11445,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +by +by +by +by +by +by +by +by +by +PX +by +Wy rT rT rT @@ -11628,21 +11639,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +PX +PX +by +by +by +by +by +by +by +PX +PX +by +Wy rT rT rT @@ -11822,21 +11833,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +PX +by +by +by +by +by +by +by +PX +by +by +Wy rT rT rT @@ -12016,21 +12027,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +PX +by +by +by +by +by +by +by +PX +by +by +Wy rT rT rT @@ -12210,21 +12221,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +PX +PX +by +mT +by +by +by +PX +PX +by +by +Wy rT rT rT @@ -12404,21 +12415,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +by +PX +by +by +by +by +by +PX +by +by +by +Wy rT rT rT @@ -12598,21 +12609,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +by +PX +PX +PX +PX +PX +PX +PX +by +by +by +Wy rT rT rT @@ -12792,21 +12803,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +by +by +by +by +by +by +by +by +by +by +by +Wy rT rT rT @@ -12986,21 +12997,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +by +by +by +by +by +by +by +by +by +by +by +Wy rT rT rT @@ -13180,21 +13191,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +by +by +by +by +by +by +by +by +by +by +by +by +by +Wy rT rT rT @@ -13374,21 +13385,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy +Wy rT rT rT @@ -13568,21 +13579,21 @@ km km jD Wy -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -18231,21 +18242,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -18425,21 +18436,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -18619,21 +18630,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -18813,21 +18824,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19007,21 +19018,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19201,21 +19212,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19395,21 +19406,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19589,21 +19600,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19783,21 +19794,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -19977,21 +19988,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -20171,21 +20182,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -20365,21 +20376,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -20559,21 +20570,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -20753,21 +20764,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -20947,21 +20958,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -21141,21 +21152,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -21335,21 +21346,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -21529,21 +21540,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -21723,21 +21734,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -21917,21 +21928,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -22111,21 +22122,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -22305,21 +22316,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -22499,21 +22510,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT @@ -22693,21 +22704,21 @@ rT rT rT rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT -rT +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj rT rT rT