From 1e21c258504e842735fcb42b5246e26c567cb08f Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2019 20:03:47 -0400 Subject: [PATCH 01/11] New Expedition Shuttle Patterned off of Baystation's shuttles. Now has limited power, proper atmos, future support for a fuel system, and some new features. Still work in progress. --- maps/tether/tether-06-station2.dmm | 17 +- maps/tether/tether-07-station3.dmm | 2510 +++++++++++++++++++++------- 2 files changed, 1889 insertions(+), 638 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index beab71cd3e6..fb85d3e808d 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -1894,19 +1894,12 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "cI" = ( -/obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/device/multitool/tether_buffered{ - pixel_y = 2 - }, /obj/machinery/requests_console{ department = "Exploration"; name = "Exploration Requests Console"; @@ -7765,7 +7758,6 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lp" = ( -/obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/borderfloor{ dir = 1; icon_state = "borderfloor"; @@ -7780,16 +7772,23 @@ dir = 4 }, /obj/machinery/camera/network/exploration, +/obj/structure/table/rack/shelf, +/obj/item/device/multitool/tether_buffered{ + pixel_y = 2 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = -4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lq" = ( -/obj/machinery/suit_cycler/pilot, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, +/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lr" = ( diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index fb1d231f76d..be0543942a9 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1970,15 +1970,23 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "di" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) -"dj" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/excursion/tether) +"dj" = ( +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "dk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2122,7 +2130,18 @@ /turf/simulated/floor, /area/maintenance/station/ai) "dy" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/brown, +/obj/structure/curtain/open/bed, +/obj/machinery/alarm{ + breach_detection = 0; + dir = 8; + icon_state = "alarm0"; + pixel_x = 25; + rcon_setting = 3; + report_danger_level = 0 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2139,26 +2158,53 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"dB" = ( -/obj/structure/table/steel, -/obj/item/clothing/head/pilot, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "dC" = ( -/obj/structure/flight_left, -/turf/simulated/shuttle/floor/black, +/obj/structure/bed/chair/comfy/blue{ + icon_state = "comfychair_preview"; + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dD" = ( -/obj/machinery/computer/shuttle_control/web/excursion{ - icon = 'icons/obj/computer.dmi'; - my_doors = list("expshuttle_door_L" = "Port Cargo", "expshuttle_door_Ro" = "Airlock Outer", "expshuttle_door_Ri" = "Airlock Inner", "expshuttle_door_cargo" = "Cargo Hatch"); - my_sensors = list("shuttlesens_exp" = "Exterior Environment", "shuttlesens_exp_int" = "Cargo Area", "shuttlesens_exp_psg" = "Passenger Area") +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + pixel_x = 26; + pixel_y = 39; + req_access = list(3) }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dE" = ( -/obj/structure/flight_right, -/turf/simulated/shuttle/floor/black, +/obj/structure/bed/chair/comfy/blue{ + icon_state = "comfychair_preview"; + dir = 1 + }, +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/alarm{ + breach_detection = 0; + dir = 8; + icon_state = "alarm0"; + pixel_x = 25; + rcon_setting = 3; + report_danger_level = 0 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dF" = ( /obj/effect/floor_decal/borderfloor{ @@ -2381,12 +2427,16 @@ /turf/simulated/wall/r_wall, /area/maintenance/station/ai) "dW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/shuttle/plating, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dX" = ( /obj/effect/floor_decal/borderfloor{ @@ -2410,45 +2460,37 @@ /turf/simulated/floor/tiled, /area/security/hallway) "dY" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"dZ" = ( /obj/item/device/radio/intercom{ - pixel_y = -24 + dir = 4; + pixel_x = 24 }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ea" = ( -/obj/structure/bed/chair/comfy/blue{ - icon_state = "comfychair_preview"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, /area/shuttle/excursion/tether) "eb" = ( -/turf/simulated/shuttle/floor/black, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "ec" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ed" = ( /obj/structure/railing, @@ -2477,12 +2519,17 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "eg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/shuttle/plating, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 27 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "eh" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -2567,6 +2614,11 @@ /obj/machinery/camera/network/exploration{ dir = 8 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "en" = ( @@ -2602,9 +2654,19 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "er" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/shuttle/plating, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, @@ -2683,8 +2745,19 @@ /turf/simulated/floor/tiled, /area/security/hallway) "ex" = ( -/obj/machinery/door/airlock/voidcraft, -/turf/simulated/shuttle/floor/black, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/visible/supply, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ey" = ( /turf/simulated/floor/carpet, @@ -2849,42 +2922,19 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/ai) -"eN" = ( -/obj/machinery/shuttle_sensor{ - dir = 2; - id_tag = "shuttlesens_exp_psg" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) -"eO" = ( -/obj/machinery/recharge_station, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"eP" = ( -/obj/structure/table/rack/shelf, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"eQ" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "eR" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/obj/structure/bed/chair/shuttle, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -32 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "eS" = ( /obj/item/frame, @@ -3051,31 +3101,38 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "fg" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 32 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"fh" = ( -/obj/machinery/sleeper{ +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fi" = ( -/obj/machinery/sleep_console, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "fj" = ( -/obj/structure/bed/chair/shuttle{ - icon_state = "shuttle_chair"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "fk" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -3250,14 +3307,23 @@ /turf/simulated/floor/tiled/dark, /area/security/security_processing) "fx" = ( -/obj/structure/bed/chair/shuttle{ - icon_state = "shuttle_chair"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/item/device/radio/intercom{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "fy" = ( /turf/simulated/wall/r_wall, @@ -3328,13 +3394,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/ai) -"fF" = ( -/obj/machinery/shuttle_sensor{ - dir = 6; - id_tag = "shuttlesens_exp_int" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) "fG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -3476,47 +3535,20 @@ "fP" = ( /turf/simulated/wall/r_wall, /area/ai_core_foyer) -"fQ" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/turf/simulated/shuttle/floor/darkred, -/area/shuttle/excursion/tether) -"fR" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/space_heater, -/turf/simulated/shuttle/floor/darkred, -/area/shuttle/excursion/tether) -"fS" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/darkred, -/area/shuttle/excursion/tether) -"fT" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"fU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/excursion/tether) "fV" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" - }, -/turf/simulated/shuttle/floor/black, +/obj/structure/table/rack, +/obj/random/toolbox, +/obj/random/powercell, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fW" = ( /obj/effect/floor_decal/borderfloorblack, @@ -3930,40 +3962,24 @@ /turf/simulated/floor, /area/maintenance/station/ai) "gL" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - frequency = 1380; - id_tag = "expshuttle_docker"; - pixel_y = 26; - req_one_access = list(19,43,67); - tag_airpump = "expshuttle_vent"; - tag_chamber_sensor = "expshuttle_sensor"; - tag_exterior_door = "expshuttle_door_Ro"; - tag_exterior_sensor = "expshuttle_exterior_sensor"; - tag_interior_door = "expshuttle_door_Ri" +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/meter, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -26 }, -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "gM" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "expshuttle_sensor"; - master_tag = "expshuttle_docker"; - pixel_y = 28 +/obj/machinery/meter, +/obj/item/device/radio/intercom{ + pixel_y = -24 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "expshuttle_vent" - }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "gN" = ( /obj/effect/floor_decal/industrial/warning{ @@ -4137,10 +4153,14 @@ /turf/simulated/floor/tiled, /area/security/eva) "hc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 }, -/turf/simulated/shuttle/wall/voidcraft, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "hd" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -5047,22 +5067,11 @@ /turf/simulated/floor/bluegrid, /area/ai) "it" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_L"; - locked = 1 +/obj/machinery/disposal/deliveryChute{ + dir = 4 }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 1; - icon_state = "doorctrl0"; - id = "expshuttle_door_L"; - name = "hatch bolt control"; - pixel_y = -28; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/turf/simulated/shuttle/floor/black, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "iu" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -5372,11 +5381,12 @@ /turf/simulated/floor, /area/maintenance/station/ai) "iK" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 1 +/obj/machinery/conveyor{ + dir = 8; + id = "shuttle_outbound" }, -/turf/simulated/shuttle/floor/black, +/obj/structure/plasticflaps, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "iL" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -5521,39 +5531,20 @@ /turf/simulated/wall, /area/maintenance/cargo) "iW" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "iX" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ri" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "expshuttle_docker"; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "iY" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" - }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "iZ" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -5621,18 +5612,6 @@ "je" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/heads/hos) -"jf" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "expshuttle_vent" - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "jg" = ( /obj/effect/floor_decal/borderfloorblack/full, /turf/simulated/floor/tiled/dark, @@ -5766,22 +5745,10 @@ /turf/simulated/floor, /area/maintenance/station/sec_upper) "jr" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ro" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 4; - pixel_y = 28 - }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "js" = ( /obj/machinery/light{ @@ -6180,28 +6147,34 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "jY" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/stasis_cage, -/turf/simulated/shuttle/floor/black, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/excursion, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( -/obj/machinery/light, -/obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 + icon_state = "warningcorner"; + dir = 1 }, -/obj/structure/stasis_cage, -/turf/simulated/shuttle/floor/black, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ka" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/shuttle/floor/black, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kb" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kc" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -6276,41 +6249,46 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/security/breakroom) -"ki" = ( +"kj" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "expshuttle_docker"; + pixel_y = 26; + req_one_access = list(19,43,67); + tag_airpump = "expshuttle_vent"; + tag_chamber_sensor = "expshuttle_sensor"; + tag_exterior_door = "expshuttle_door_Ro"; + tag_exterior_sensor = "expshuttle_exterior_sensor"; + tag_interior_door = "expshuttle_door_Ri" + }, /obj/effect/floor_decal/industrial/warning{ - dir = 10 + icon_state = "warning"; + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; + dir = 2; frequency = 1380; id_tag = "expshuttle_docker_pump_out_internal" }, -/turf/simulated/shuttle/floor/black, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"kj" = ( +"kk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6 + dir = 5 }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "expshuttle_sensor"; + master_tag = "expshuttle_docker"; + pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; + dir = 2; frequency = 1380; id_tag = "expshuttle_vent" }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"kk" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kl" = ( /obj/structure/cable/cyan{ @@ -6359,10 +6337,10 @@ /turf/simulated/floor/bluegrid, /area/ai) "kn" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{ - name = "\improper Shuttle Scrubber" +/obj/machinery/cryopod{ + dir = 4 }, -/turf/simulated/shuttle/floor/darkred, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ko" = ( /turf/simulated/wall/r_wall, @@ -6457,34 +6435,52 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "kw" = ( -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 4; - icon_state = "doorctrl0"; - id = "expshuttle_door_cargo"; - name = "hatch bolt control"; - pixel_x = -32; - req_one_access = list(19,43,67); - specialfunctions = 4 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/metal{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_cargo"; - locked = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"kx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/excursion/tether) -"ky" = ( -/obj/machinery/atmospherics/pipe/tank/air{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/shuttle/floor/darkred, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"kx" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "expshuttle_door_Ri"; + locked = 1 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "expshuttle_docker"; + pixel_y = -24 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"ky" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kz" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -6720,17 +6716,25 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "kQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/machinery/meter, -/turf/simulated/shuttle/floor/darkred, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 }, -/turf/simulated/shuttle/wall/voidcraft, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kS" = ( /obj/effect/landmark{ @@ -7037,13 +7041,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "lq" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ - dir = 1; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external"; - power_rating = 20000 - }, -/turf/simulated/shuttle/wall/voidcraft, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/recharger, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "lr" = ( /obj/effect/floor_decal/techfloor{ @@ -7442,6 +7444,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "lX" = ( @@ -27754,9 +27757,10 @@ /turf/simulated/mineral/vacuum, /area/quartermaster/office) "Rv" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "Rw" = ( /obj/structure/catwalk, @@ -28404,6 +28408,11 @@ pixel_x = 32; req_one_access = list(19,43,67) }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "SL" = ( @@ -28425,6 +28434,20 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/elevator) +"SO" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "SP" = ( /obj/structure/table/woodentable, /obj/item/device/taperecorder{ @@ -28436,6 +28459,31 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"SQ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/tether/exploration) +"SR" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_external"; + power_rating = 20000 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) "ST" = ( /obj/machinery/firealarm{ dir = 8; @@ -28450,6 +28498,11 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"SY" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/tether/exploration) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -28464,6 +28517,34 @@ }, /turf/simulated/floor/carpet, /area/security/breakroom) +"Ti" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Tl" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/turf/simulated/floor/tiled, +/area/tether/exploration) "Tp" = ( /obj/structure/cable{ d1 = 1; @@ -28474,6 +28555,30 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"Tq" = ( +/obj/machinery/power/port_gen/pacman/mrs, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Tu" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + icon_state = "intact-supply"; + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "TD" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28485,6 +28590,29 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"TG" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_internal" + }, +/obj/structure/cable/cyan, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"TJ" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) "TO" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/secure/safe{ @@ -28505,6 +28633,22 @@ /obj/item/weapon/storage/box/donkpockets, /turf/simulated/floor/wood, /area/security/breakroom) +"TT" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/excursion/tether) +"TV" = ( +/obj/structure/table/steel, +/obj/item/clothing/head/pilot, +/turf/simulated/shuttle/floor/black, +/area/space) "TX" = ( /obj/machinery/alarm{ dir = 8; @@ -28519,6 +28663,23 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"Uf" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"Uk" = ( +/obj/structure/bed/chair/shuttle, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Um" = ( +/obj/machinery/sleep_console, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Un" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28533,6 +28694,11 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"Uo" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/shuttle/floor/darkred, +/area/space) "Up" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -28578,10 +28744,29 @@ }, /turf/simulated/floor/tiled, /area/security/eva) +"Us" = ( +/obj/structure/bed/chair/shuttle, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + frequency = 1441; + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Uu" = ( /obj/machinery/computer/security, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"Uv" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/shuttle/plating, +/area/space) "Uw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -28601,6 +28786,37 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"Uz" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"UB" = ( +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "UC" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28614,6 +28830,84 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"UE" = ( +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"UH" = ( +/obj/structure/bed/chair/shuttle, +/turf/simulated/shuttle/floor/black, +/area/space) +"UJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) +"UK" = ( +/turf/simulated/wall/thull, +/area/tether/exploration) +"UL" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"UM" = ( +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ + dir = 8; + start_pressure = 3039.75 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"UO" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/terminal, +/obj/machinery/cell_charger, +/obj/item/clothing/head/pilot, +/obj/item/clothing/head/pilot, +/obj/structure/table/steel, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"UQ" = ( +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/shuttle/floor/darkred, +/area/space) +"UR" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ + dir = 8; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_external"; + power_rating = 20000 + }, +/turf/simulated/wall/thull, +/area/tether/exploration) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -28637,6 +28931,23 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"UU" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_internal" + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24; + req_access = list() + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "UV" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -28646,6 +28957,44 @@ }, /turf/simulated/floor/tiled, /area/security/security_bathroom) +"UW" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"UY" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/shuttle/plating, +/area/space) +"UZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"Vd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_vent" + }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "Ve" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28657,6 +29006,55 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"Vf" = ( +/obj/structure/table/rack/shelf, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/pickaxe, +/turf/simulated/floor/tiled, +/area/tether/exploration) +"Vg" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/closet/crate/freezer/rations, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Vi" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/turf/simulated/shuttle/floor/darkred, +/area/space) +"Vl" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"Vm" = ( +/obj/structure/bed/chair/shuttle{ + icon_state = "shuttle_chair"; + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Vn" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -28669,6 +29067,12 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"Vo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/wall/thull, +/area/tether/exploration) "Vp" = ( /obj/structure/cable/green{ d1 = 2; @@ -28677,6 +29081,85 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"Vq" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Vs" = ( +/obj/machinery/door/airlock/voidcraft, +/turf/simulated/shuttle/floor/black, +/area/space) +"Vu" = ( +/obj/structure/flight_left, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Vw" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Vx" = ( +/turf/simulated/shuttle/floor/black, +/area/space) +"Vy" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/shuttle/plating, +/area/space) +"VA" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"VB" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/tether/exploration) +"VD" = ( +/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"VE" = ( +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration) +"VI" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "VJ" = ( /obj/structure/cable/green{ d2 = 2; @@ -28710,10 +29193,125 @@ "VM" = ( /turf/simulated/open, /area/ai_core_foyer) +"VQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/wall/thull, +/area/tether/exploration) +"VR" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"VS" = ( +/obj/machinery/shuttle_sensor{ + dir = 6; + id_tag = "shuttlesens_exp_int" + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"VU" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "shuttle_outbound" + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "VX" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"Wd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Wg" = ( +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Wj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/shuttle/floor/darkred, +/area/space) +"Wk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) +"Wm" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + frequency = 1380; + id_tag = "expshuttle_door_Ri" + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "expshuttle_docker"; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Wn" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) +"Ws" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/wall/thull, +/area/tether/exploration) +"Wu" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Wx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/tether/exploration) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -28729,20 +29327,307 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"WC" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/closet/secure_closet/guncabinet/excursion, +/turf/simulated/shuttle/floor/darkred, +/area/space) +"WD" = ( +/obj/structure/flight_right, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"WG" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/exploration) +"WH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/space) +"WJ" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"WL" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"WQ" = ( +/obj/structure/bed/chair/comfy/blue{ + icon_state = "comfychair_preview"; + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"WR" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"WS" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "WY" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) +"Xa" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "shuttle_outbound" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24; + req_access = list() + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Xb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) "Xe" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/wood, /area/security/breakroom) +"Xg" = ( +/obj/machinery/shuttle_sensor{ + dir = 2; + id_tag = "shuttlesens_exp_psg" + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"Xi" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Xk" = ( +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Xl" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Xo" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Xp" = ( +/obj/machinery/power/smes/buildable/outpost_substation, +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"Xq" = ( +/obj/structure/bed/chair/shuttle{ + icon_state = "shuttle_chair"; + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Xr" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"Xt" = ( +/obj/machinery/shuttle_sensor{ + dir = 5; + id_tag = "shuttlesens_exp" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"Xy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/space) +"XA" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"XB" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"XC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/turf/simulated/wall/thull, +/area/tether/exploration) +"XE" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "shuttle_inbound" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/plating, +/area/tether/exploration) "XG" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/eva) +"XJ" = ( +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + dir = 4; + icon_state = "doorctrl0"; + id = "expshuttle_door_cargo"; + name = "hatch bolt control"; + pixel_x = -32; + req_one_access = list(19,43,67); + specialfunctions = 4 + }, +/obj/machinery/door/airlock/multi_tile/metal{ + icon_state = "door_locked"; + id_tag = "expshuttle_door_cargo"; + locked = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"XN" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"XO" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + icon_state = "door_locked"; + id_tag = "expshuttle_door_L"; + locked = 1 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + dir = 1; + icon_state = "doorctrl0"; + id = "expshuttle_door_L"; + name = "hatch bolt control"; + pixel_y = -28; + req_one_access = list(19,43,67); + specialfunctions = 4 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"XR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/exploration{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) +"XS" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/space) "XT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -28765,15 +29650,155 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"XZ" = ( +/obj/machinery/computer/shuttle_control/web/excursion{ + icon = 'icons/obj/computer.dmi'; + my_doors = list("expshuttle_door_L" = "Port Cargo", "expshuttle_door_Ro" = "Airlock Outer", "expshuttle_door_Ri" = "Airlock Inner", "expshuttle_door_cargo" = "Cargo Hatch"); + my_sensors = list("shuttlesens_exp" = "Exterior Environment", "shuttlesens_exp_int" = "Cargo Area", "shuttlesens_exp_psg" = "Passenger Area") + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Yg" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Yi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) +"Yj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_internal" + }, +/obj/machinery/oxygen_pump{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Ym" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + icon_state = "intact"; + dir = 6 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/supply, +/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Ys" = ( +/obj/structure/bed/chair/shuttle{ + icon_state = "shuttle_chair"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Yu" = ( /obj/structure/closet/secure_closet/hos2, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"Yw" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"Yx" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"YC" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/shuttle/plating, +/area/space) +"YD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "YH" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, /turf/simulated/floor/wood, /area/security/breakroom) +"YI" = ( +/obj/structure/bed/chair/shuttle{ + icon_state = "shuttle_chair"; + dir = 1 + }, +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"YQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + icon_state = "map-scrubbers"; + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) +"YR" = ( +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{ + name = "\improper Shuttle Scrubber" + }, +/turf/simulated/shuttle/floor/darkred, +/area/space) "YT" = ( /turf/simulated/wall, /area/security/breakroom) @@ -28791,6 +29816,186 @@ }, /turf/space, /area/space) +"YY" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Za" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/excursion/tether) +"Zc" = ( +/turf/simulated/floor/reinforced, +/area/space) +"Zd" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "shuttle_inbound" + }, +/obj/structure/plasticflaps, +/turf/simulated/floor/plating, +/area/tether/exploration) +"Zg" = ( +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) +"Zk" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Zo" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"Zv" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + frequency = 1380; + id_tag = "expshuttle_door_Ro" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + frequency = 1380; + id_tag = "expshuttle_exterior_sensor"; + master_tag = "expshuttle_docker"; + pixel_x = 4; + pixel_y = 28 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Zw" = ( +/obj/machinery/light, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/shuttle/floor/black, +/area/space) +"Zy" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/exploration) +"ZB" = ( +/obj/machinery/shuttle_sensor{ + dir = 5; + id_tag = "shuttlesens_exp" + }, +/turf/simulated/wall/thull, +/area/tether/exploration) +"ZD" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) +"ZE" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "expshuttle_door_Ro"; + locked = 1 + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + frequency = 1380; + id_tag = "expshuttle_exterior_sensor"; + master_tag = "expshuttle_docker"; + pixel_x = 4; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/exploration) +"ZG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/meter, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"ZK" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/space) +"ZL" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/excursion/tether) "ZM" = ( /obj/structure/table/woodentable, /obj/item/device/radio/off, @@ -28800,6 +30005,53 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) +"ZQ" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/shuttle/floor/black, +/area/space) +"ZT" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/cyan, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"ZU" = ( +/obj/machinery/suit_cycler/pilot, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -26 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration) +"ZW" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) +"ZX" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + icon_state = "intact"; + dir = 6 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "ZY" = ( /turf/simulated/wall/r_wall, /area/security/security_lockerroom) @@ -39497,10 +40749,10 @@ cK cK cK cK -cK -cK -cK -cK +XE +Zd +UK +UK cK ms Oz @@ -39629,21 +40881,21 @@ bX cE cK cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK +UK +UK +Wx +UK +Wx +UK +Wx +UK +UK +UK +Zy +WG +UK +XA +SY ms Oz be @@ -39771,21 +41023,21 @@ cp cE cK cK -cK -cK -cK -cK -cK -cK -di -fF +UK +Tl +ZU +UK +Vf +VE +Vw +dj it -di -di -dy -Rv -cK -cK +Wn +UJ +Xb +dj +XN +SY ms mq be @@ -39912,22 +41164,22 @@ be bX cE cK -cK -di +UK +dj dW -di -dW -di -di -di -fQ +UB +dj +UE +Wg +Um +dj iK jY kn -di -Rv -cK -cK +WS +dj +XN +SY ms nA be @@ -40047,7 +41299,7 @@ aa aa aa aa -aa +TV aa aa be @@ -40057,18 +41309,18 @@ cK di dy dY -di -eO +Tu +dj eR -fh -di -fR -iK -jY -kn -di -Rv -cK +Wg +YI +dj +VU +Zk +WR +ZT +iX +Vo cK ms nz @@ -40186,7 +41438,7 @@ aa aa aa aa -aa +WC aa aa aa @@ -40195,22 +41447,22 @@ aa be bX cE -cK +UK dj -dB -dZ -di -eP -eb +dj +dj +ZL +dj +Us fi -di -fS -iK +Vm +dj +Xa jZ -dy -di -cK -cK +Vq +Xo +XN +SY cK ms mq @@ -40321,14 +41573,14 @@ aa aa aa aa +VA +VS +XO +VA +VA +ZK aa -aa -aa -aa -aa -aa -aa -aa +Uo aa aa aa @@ -40337,22 +41589,22 @@ aa be cs cF -cK -dj +VB +Vu dC ea er -eQ -eb +ea +Uk fj -er -fT +Ys +ea iW ka kw -cK -cK -cK +Uf +XN +SY cK ms mq @@ -40463,14 +41715,14 @@ aa aa aa aa +VA aa +WL +ZQ +YR +VA aa -aa -aa -aa -aa -aa -aa +UQ aa aa aa @@ -40479,22 +41731,22 @@ aa be bY cE -cK -dj +VB +XZ dD eb ex -eb -eb -eb -ex -eb -eb -ka -eb -cK -cK -cK +TT +Ti +Ym +Uz +Za +SO +Zo +Xi +Vl +XN +SY cK ms VX @@ -40605,12 +41857,12 @@ aa aa aa aa +VA aa -aa -aa -aa -aa -aa +WL +ZQ +YR +VA aa aa aa @@ -40621,22 +41873,22 @@ aa be cA cG -cK -dj +VB +WD dE -ea -er -eQ -eb +dj +Zg +dj +dj fx -di -fU +dj +dj iX kb -kb +ZW lq -cK -cK +Xr +SY cK ms mq @@ -40747,38 +41999,38 @@ aa aa aa aa +VA +aa +WL +Zw +ZK +VA aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +TV aa aa be bX cE -cK +UK dj -dB -eb -eN -eQ -eb -fj -di +dj +dj +ZL +dj +Wd +UL +Vg fV iY -ki +ea kx -lq -cK -cK +dj +XN +SY cK ms mq @@ -40889,12 +42141,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +Uv +Yx +XS +ZQ +XJ +Zc aa aa aa @@ -40907,20 +42159,20 @@ bX cE cK di -dy +Tq ec -di -eQ +Xk +dj fg -fj -di +Yg +VD gL -eb -ka +ZD +UU ky -di +Yj Rv -cK +XC cK ms nz @@ -41031,12 +42283,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +Vs +Vx +Vx +ZQ +Vx +Zc aa aa aa @@ -41048,22 +42300,22 @@ be bX cE cK -cK -di +UK +dj eg -di -eg -di -di -di +Xl +dj +ZG +VR +UW gM -jf +dj kj kQ -di -Rv -cK -cK +TG +dj +XN +SY ms nA be @@ -41191,21 +42443,21 @@ cp cE cK cK -cK -cK -cK -cK -cK -cK -di +UK +UO +Xp +UK +UM +TJ +ZX hc jr kk kR -dy -Rv -cK -cK +Vd +dj +XN +SY ms QL be @@ -41333,21 +42585,21 @@ bX cE cK cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK -cK +UK +UK +SQ +UK +UK +UK +UR +UR +VQ +Ws +ZE +ZB +UK +XB +SY ms Sq be @@ -41476,6 +42728,7 @@ cE cK cK cK +Yw cK cK cK @@ -41486,9 +42739,8 @@ cK cK cK cK -cK -cK -cK +UK +UK cK ms mq @@ -41603,12 +42855,12 @@ aa aa aa aa +VA aa -aa -aa -aa -aa -aa +Wm +WJ +WJ +SR aa aa aa @@ -41618,7 +42870,7 @@ cH db dk dF -dF +YD dF dF dF @@ -41745,12 +42997,12 @@ aa aa aa aa +VA aa aa aa -aa -aa -aa +WH +SR aa aa aa @@ -41761,18 +43013,18 @@ dc dl dH em -cC -cC -cC -dc -dH -dl +Wk +Wk +Wk +Yi +VI +YQ SK -cC -cC -em -dH -dl +Wk +Wk +XR +VI +YQ lW mu nB @@ -41887,12 +43139,12 @@ aa aa aa aa +VA aa aa aa -aa -aa -aa +Vi +VA aa aa aa @@ -42029,12 +43281,12 @@ aa aa aa aa +VA aa aa aa -aa -aa -aa +Wj +VA aa aa aa @@ -42171,12 +43423,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +VA +Xy +Zv +Xt +UZ +ZK aa aa aa @@ -42452,13 +43704,13 @@ aa aa aa aa +Zc +VA +YC +VA aa -aa -aa -aa -aa -aa -aa +VA +VA aa aa aa @@ -42594,12 +43846,12 @@ aa aa aa aa +VA +ZK aa +VA aa -aa -aa -aa -aa +Wu aa aa aa @@ -42736,12 +43988,12 @@ aa aa aa aa +Vy aa aa +VA aa -aa -aa -aa +Vx aa aa aa @@ -42878,13 +44130,13 @@ aa aa aa aa +Vy aa -aa -aa -aa -aa -aa -aa +WQ +Uv +UH +Vx +Xq aa aa aa @@ -43022,11 +44274,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +Vx +Vs +Vx +Vx +Vx aa aa aa @@ -43164,10 +44416,10 @@ aa aa aa aa -aa -aa -aa -aa +WQ +Uv +UH +Vx aa aa aa @@ -43306,11 +44558,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +Vx +Xg +UH +Vx +Xq aa aa aa @@ -43446,13 +44698,13 @@ aa aa aa aa +VA +ZK aa -aa -aa -aa -aa -aa -aa +VA +UH +YY +Xq aa aa aa @@ -43588,13 +44840,13 @@ aa aa aa aa +Zc +VA +UY +VA aa -aa -aa -aa -aa -aa -aa +VA +VA aa aa aa From 2cbccfc3337cdf7d6c587f1ebac7b9fee1365257 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2019 21:03:17 -0400 Subject: [PATCH 02/11] Mow --- maps/tether/submaps/aerostat/aerostat.dmm | 208 +-- maps/tether/submaps/beach/beach.dmm | 210 ++-- maps/tether/submaps/space/debrisfield.dmm | 206 +-- maps/tether/submaps/tether_ships.dmm | 1392 ++++++++++----------- maps/tether/tether-05-station1.dmm | 400 +++--- maps/tether/tether-07-station3.dmm | 918 +++----------- 6 files changed, 1359 insertions(+), 1975 deletions(-) diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm index 0e58d82cb01..4ed1152b1cb 100644 --- a/maps/tether/submaps/aerostat/aerostat.dmm +++ b/maps/tether/submaps/aerostat/aerostat.dmm @@ -4742,10 +4742,10 @@ aw aw aw aw -aw -aw -aw -aw +cv +cv +cv +cv aw aw aw @@ -4874,21 +4874,21 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5016,21 +5016,21 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5157,15 +5157,15 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv cv cv cv @@ -5299,24 +5299,24 @@ aw aw aw aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -aw -aw aw aw aw @@ -5440,25 +5440,25 @@ aw aw aw aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -aw -aw aw aw aw @@ -5582,9 +5582,9 @@ aw aw aw aw -aw -aw -aw +cv +cv +cv cv cv cv @@ -5724,9 +5724,6 @@ aw aw aw aw -aw -aw -aw cv cv cv @@ -5739,7 +5736,10 @@ cv cv cv cv -aw +cv +cv +cv +cv aw aw aw @@ -5866,9 +5866,6 @@ aw aw aw aw -aw -aw -aw cv cv cv @@ -5881,7 +5878,10 @@ cv cv cv cv -aw +cv +cv +cv +cv aw aw aw @@ -6008,9 +6008,9 @@ aw aw aw aw -aw -aw -aw +cv +cv +cv cv cv cv @@ -6151,8 +6151,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6293,8 +6293,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6436,8 +6436,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6578,14 +6578,14 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv cv cv cv @@ -6732,8 +6732,8 @@ aw aw cc cY -aw -aw +cv +cv aw aw aw diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index 640ad0bff51..a9dd088557f 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -8218,10 +8218,10 @@ aa aa aa aa -aa -aa -aa -aa +bm +bm +bm +bm aa aa aa @@ -8350,21 +8350,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa aa @@ -8492,14 +8492,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm bm bm bm @@ -8633,9 +8633,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -8775,23 +8775,23 @@ aa aa aa aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -aa aa aa aa @@ -8916,9 +8916,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9058,9 +9058,6 @@ aa aa aa aa -aa -aa -aa bm bm bm @@ -9073,7 +9070,10 @@ bm bm bm bm -aa +bm +bm +bm +bm aa aa aa @@ -9200,9 +9200,6 @@ aa aa aa aa -aa -aa -aa bm bm bm @@ -9215,7 +9212,10 @@ bm bm bm bm -aa +bm +bm +bm +bm aa aa bs @@ -9342,9 +9342,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9484,9 +9484,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9627,23 +9627,23 @@ aa aa aa aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -aa aa aa aa @@ -9769,9 +9769,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9912,14 +9912,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm bm bm bm @@ -10054,21 +10054,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa aa @@ -10208,8 +10208,8 @@ aa aa aa aa -aa -aa +bm +bm aa aa aa diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm index 56ad612f88c..26c799cad5a 100644 --- a/maps/tether/submaps/space/debrisfield.dmm +++ b/maps/tether/submaps/space/debrisfield.dmm @@ -8623,10 +8623,10 @@ b b b b -b -b -b -b +f +f +f +f b b b @@ -8755,21 +8755,21 @@ b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b b @@ -8897,14 +8897,14 @@ b b b b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f f f f @@ -9038,9 +9038,9 @@ b b b b -b -b -b +f +f +f f f f @@ -9180,23 +9180,23 @@ b b b b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -b b b b @@ -9321,9 +9321,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9463,9 +9463,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9605,9 +9605,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9747,9 +9747,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9889,9 +9889,9 @@ a b b b -b -b -b +f +f +f f f f @@ -10032,23 +10032,23 @@ b b b b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -b b b b @@ -10174,9 +10174,9 @@ b b b b -b -b -b +f +f +f f f f @@ -10317,14 +10317,14 @@ b b b b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f f f f @@ -10459,21 +10459,21 @@ b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b b @@ -10613,8 +10613,8 @@ b b b b -b -b +f +f b b b diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm index 1b341bcefc0..9d0817e6a98 100644 --- a/maps/tether/submaps/tether_ships.dmm +++ b/maps/tether/submaps/tether_ships.dmm @@ -1802,15 +1802,6 @@ }, /turf/unsimulated/wall, /area/space) -"eJ" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/sandyscroll, -/area/space) "eK" = ( /obj/structure/catwalk, /obj/machinery/vending/tool, @@ -1859,19 +1850,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/houseboat/holodeck/desert) -"eT" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/sandyscroll, -/area/space) -"eU" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/sandyscroll, -/area/space) "eW" = ( /obj/structure/railing{ icon_state = "railing0"; @@ -2636,15 +2614,6 @@ "hf" = ( /turf/space/transit/east, /area/shuttle/large_escape_pod1/transit) -"hg" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/bluespace, -/area/space) "hh" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2680,19 +2649,6 @@ "hk" = ( /turf/simulated/sky/virgo3b/south, /area/shuttle/tether/transit) -"hl" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/bluespace, -/area/space) -"hm" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/bluespace, -/area/space) "hn" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2771,15 +2727,6 @@ icon_state = "rock" }, /area/space) -"hy" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/transit/south, -/area/space) "hz" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2790,28 +2737,6 @@ }, /turf/space/transit/south, /area/space) -"hA" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/transit/south, -/area/space) -"hB" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/transit/south, -/area/space) -"hC" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space, -/area/space) "hD" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2822,19 +2747,6 @@ }, /turf/space, /area/space) -"hE" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space, -/area/space) -"hF" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space, -/area/space) "hG" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3518,12 +3430,12 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO gU gU dQ @@ -3542,12 +3454,12 @@ et et et et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj et et et @@ -3568,12 +3480,12 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz hp hp hp @@ -3650,23 +3562,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +hd +hd +hd +hd +eO +eO gU dQ aa @@ -3676,22 +3588,22 @@ et et et et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +fg +fg +fg +fg +hj et et gV @@ -3702,23 +3614,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hq +hq +hq +hq +hz +hz hp ht aa @@ -3792,23 +3704,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU eO +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd eO -eO -eO -eO -eO -eO -eO -eO -gU -gU gU dQ aa @@ -3818,22 +3730,22 @@ et et et et -et -et -et -et -et -et hj -hj -hj -hj -hj -hj -hj -hj -hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -3844,23 +3756,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp hz +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq hz -hz -hz -hz -hz -hz -hz -hz -hp -hp hp ht aa @@ -3933,14 +3845,16 @@ gU gU gU gU -gU eO eO -eO -eO -eO -eO -eJ +hd +hd +hd +hd +hd +hd +hd +hd hd hd hd @@ -3950,8 +3864,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -3959,14 +3871,8 @@ et et et et -et hj hj -hj -hj -hj -hj -hg fg fg fg @@ -3974,8 +3880,14 @@ fg fg fg fg -hj -et +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -3985,14 +3897,16 @@ hp hp hp hp -hp hz hz -hz -hz -hz -hz -hy +hq +hq +hq +hq +hq +hq +hq +hq hq hq hq @@ -4002,8 +3916,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -4075,8 +3987,10 @@ gU gU gU gU -eU -eJ +eO +hd +hd +hd hd hd hd @@ -4092,8 +4006,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -4101,23 +4013,23 @@ et et et et -hg -hg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -4128,7 +4040,9 @@ hp hp hp hz -hy +hq +hq +hq hq hq hq @@ -4144,8 +4058,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -4216,7 +4128,7 @@ dQ gU gU gU -gU +eO eO hd hd @@ -4232,9 +4144,9 @@ hd hd hd hd +hd +eO eO -gU -gU gU dQ aa @@ -4242,7 +4154,7 @@ gV et et et -et +hj hj fg fg @@ -4258,17 +4170,17 @@ fg fg fg fg +fg hj et et -et gV dJ ht hp hp hp -hp +hz hz hq hq @@ -4284,9 +4196,9 @@ hq hq hq hq +hq +hz hz -hp -hp hp ht aa @@ -4358,8 +4270,10 @@ dQ gU gU gU -gU -eJ +eO +hd +hd +hd hd hd hd @@ -4376,16 +4290,16 @@ hd eO eO gU -gU -gU dQ dJ gV et et et -et -hg +hj +fg +fg +fg fg fg fg @@ -4400,8 +4314,6 @@ fg fg fg hj -hj -et et et gV @@ -4410,8 +4322,10 @@ ht hp hp hp -hp -hy +hz +hq +hq +hq hq hq hq @@ -4428,8 +4342,6 @@ hq hz hz hp -hp -hp ht aa "} @@ -4500,8 +4412,11 @@ dQ gU gU gU -gU -eJ +eO +hd +hd +hd +hd hd hd hd @@ -4515,9 +4430,6 @@ hd hd hd eO -eO -gU -gU gU gU dQ @@ -4526,8 +4438,11 @@ gV et et et -et -hg +hj +fg +fg +fg +fg fg fg fg @@ -4541,9 +4456,6 @@ fg fg fg hj -hj -et -et et et gV @@ -4552,8 +4464,11 @@ ht hp hp hp -hp -hy +hz +hq +hq +hq +hq hq hq hq @@ -4567,9 +4482,6 @@ hq hq hq hz -hz -hp -hp hp hp ht @@ -4642,8 +4554,11 @@ dQ gU gU gU -gU -eT +eO +hd +hd +hd +hd hd hd hd @@ -4657,9 +4572,6 @@ hd hd hd eO -eO -gU -gU gU gU dQ @@ -4668,8 +4580,11 @@ gV et et et -et -hl +hj +fg +fg +fg +fg fg fg fg @@ -4683,9 +4598,6 @@ fg fg fg hj -hj -et -et et et gV @@ -4694,8 +4606,11 @@ ht hp hp hp -hp -hA +hz +hq +hq +hq +hq hq hq hq @@ -4709,9 +4624,6 @@ hq hq hq hz -hz -hp -hp hp hp ht @@ -4784,8 +4696,10 @@ dQ gU gU gU -gU -eU +eO +hd +hd +hd hd hd hd @@ -4802,16 +4716,16 @@ hd eO gU gU -gU -gU dQ aa gV et et et -et -hm +hj +fg +fg +fg fg fg fg @@ -4828,16 +4742,16 @@ fg hj et et -et -et gV dJ ht hp hp hp -hp -hB +hz +hq +hq +hq hq hq hq @@ -4854,8 +4768,6 @@ hq hz hp hp -hp -hp ht aa "} @@ -4926,8 +4838,10 @@ dQ gU gU gU -gU -eU +eO +hd +hd +hd hd hd hd @@ -4944,16 +4858,16 @@ hd eO eO gU -gU -gU dQ aa gV et et et -et -hm +hj +fg +fg +fg fg fg fg @@ -4968,8 +4882,6 @@ fg fg fg hj -hj -et et et gV @@ -4978,8 +4890,10 @@ ht hp hp hp -hp -hB +hz +hq +hq +hq hq hq hq @@ -4996,8 +4910,6 @@ hq hz hz hp -hp -hp ht aa "} @@ -5068,8 +4980,9 @@ dQ gU gU gU -gU -eU +eO +eO +hd hd hd hd @@ -5085,8 +4998,7 @@ hd hd hd eO -gU -gU +eO gU dQ aa @@ -5094,8 +5006,9 @@ gV et et et -et -hm +hj +hj +fg fg fg fg @@ -5113,15 +5026,15 @@ fg hj et et -et gV dJ ht hp hp hp -hp -hB +hz +hz +hq hq hq hq @@ -5137,8 +5050,7 @@ hq hq hq hz -hp -hp +hz hp ht aa @@ -5211,8 +5123,10 @@ gU gU gU gU -eU -eU +eO +hd +hd +hd hd hd hd @@ -5228,8 +5142,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -5237,23 +5149,23 @@ et et et et -hg -hm -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5263,8 +5175,10 @@ hp hp hp hp -hB -hB +hz +hq +hq +hq hq hq hq @@ -5280,8 +5194,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -5353,14 +5265,16 @@ gU gU gU gU -gU eO eO -eO -eO -eO -eO -eU +hd +hd +hd +hd +hd +hd +hd +hd hd hd hd @@ -5370,8 +5284,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -5379,14 +5291,8 @@ et et et et -et hj hj -hj -hj -hj -hj -hm fg fg fg @@ -5394,8 +5300,14 @@ fg fg fg fg -hj -et +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5405,14 +5317,16 @@ hp hp hp hp -hp hz hz -hz -hz -hz -hz -hB +hq +hq +hq +hq +hq +hq +hq +hq hq hq hq @@ -5422,8 +5336,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -5496,23 +5408,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU eO +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd eO -eO -eO -eO -eO -eO -eO -eO -gU -gU gU dQ aa @@ -5522,22 +5434,22 @@ et et et et -et -et -et -et -et -et hj -hj -hj -hj -hj -hj -hj -hj -hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5548,23 +5460,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp hz +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq hz -hz -hz -hz -hz -hz -hz -hz -hp -hp hp ht aa @@ -5638,23 +5550,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +hd +hd +eO +eO gU dQ aa @@ -5664,22 +5576,22 @@ et et et et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +fg +fg +hj et et gV @@ -5690,23 +5602,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hq +hq +hz +hz hp ht aa @@ -5792,10 +5704,10 @@ gU gU gU gU -gU -gU -gU -gU +eO +eO +eO +eO gU gU dQ @@ -5816,10 +5728,10 @@ et et et et -et -et -et -et +hj +hj +hj +hj et et et @@ -5844,10 +5756,10 @@ hp hp hp hp -hp -hp -hp -hp +hz +hz +hz +hz hp hp ht @@ -6952,12 +6864,12 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho hc hc gO @@ -6978,12 +6890,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD aa aa hu @@ -7084,23 +6996,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +gP +gP +gP +gP +ho +ho hc gO dJ @@ -7110,23 +7022,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +he +he +he +he +hD +hD aa hu aa @@ -7226,23 +7138,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc ho +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP ho -ho -ho -ho -ho -ho -ho -ho -hc -hc hc gO dJ @@ -7252,23 +7164,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa hD +he +he +he +he +he +he +he +he +he +he +he +he +he +he +he hD -hD -hD -hD -hD -hD -hD -hD -aa -aa aa hu aa @@ -7367,14 +7279,16 @@ hc hc hc hc -hc ho ho -ho -ho -ho -ho -hn +gP +gP +gP +gP +gP +gP +gP +gP gP gP gP @@ -7384,8 +7298,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -7393,14 +7305,16 @@ aa aa aa aa -aa hD hD -hD -hD -hD -hD -hC +he +he +he +he +he +he +he +he he he he @@ -7410,8 +7324,6 @@ he he hD aa -aa -aa hu aa "} @@ -7509,8 +7421,10 @@ hc hc hc hc -hr -hn +ho +gP +gP +gP gP gP gP @@ -7526,8 +7440,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -7536,7 +7448,9 @@ aa aa aa hD -hC +he +he +he he he he @@ -7552,8 +7466,6 @@ he he hD aa -aa -aa hu aa "} @@ -7650,7 +7562,7 @@ gO hc hc hc -hc +ho ho gP gP @@ -7666,9 +7578,9 @@ gP gP gP gP +gP +ho ho -hc -hc hc gO dJ @@ -7676,7 +7588,7 @@ hu aa aa aa -aa +hD hD he he @@ -7692,9 +7604,9 @@ he he he he +he +hD hD -aa -aa aa hu aa @@ -7792,8 +7704,10 @@ gO hc hc hc -hc -hn +ho +gP +gP +gP gP gP gP @@ -7810,16 +7724,16 @@ gP ho ho hc -hc -hc gO dJ hu aa aa aa -aa -hC +hD +he +he +he he he he @@ -7836,8 +7750,6 @@ he hD hD aa -aa -aa hu aa "} @@ -7934,8 +7846,11 @@ gO hc hc hc -hc -hn +ho +gP +gP +gP +gP gP gP gP @@ -7949,9 +7864,6 @@ gP gP gP ho -ho -hc -hc hc hc gO @@ -7960,8 +7872,11 @@ hu aa aa aa -aa -hC +hD +he +he +he +he he he he @@ -7975,9 +7890,6 @@ he he he hD -hD -aa -aa aa aa hu @@ -8076,8 +7988,11 @@ gO hc hc hc -hc -gO +ho +gP +gP +gP +gP gP gP gP @@ -8091,9 +8006,6 @@ gP gP gP ho -ho -hc -hc hc hc gO @@ -8102,8 +8014,11 @@ hu aa aa aa -aa -hE +hD +he +he +he +he he he he @@ -8117,9 +8032,6 @@ he he he hD -hD -aa -aa aa aa hu @@ -8218,8 +8130,10 @@ gO hc hc hc -hc -hr +ho +gP +gP +gP gP gP gP @@ -8236,16 +8150,16 @@ gP ho hc hc -hc -hc gO dJ hu aa aa aa -aa -hF +hD +he +he +he he he he @@ -8262,8 +8176,6 @@ he hD aa aa -aa -aa hu aa "} @@ -8360,8 +8272,10 @@ gO hc hc hc -hc -hr +ho +gP +gP +gP gP gP gP @@ -8378,16 +8292,16 @@ gP ho ho hc -hc -hc gO dJ hu aa aa aa -aa -hF +hD +he +he +he he he he @@ -8404,8 +8318,6 @@ he hD hD aa -aa -aa hu aa "} @@ -8502,8 +8414,9 @@ gO hc hc hc -hc -hr +ho +ho +gP gP gP gP @@ -8519,8 +8432,7 @@ gP gP gP ho -hc -hc +ho hc gO dJ @@ -8528,8 +8440,9 @@ hu aa aa aa -aa -hF +hD +hD +he he he he @@ -8545,8 +8458,7 @@ he he he hD -aa -aa +hD aa hu aa @@ -8645,8 +8557,10 @@ hc hc hc hc -hr -hr +ho +gP +gP +gP gP gP gP @@ -8662,8 +8576,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -8672,7 +8584,9 @@ aa aa aa hD -hF +he +he +he he he he @@ -8688,8 +8602,6 @@ he he hD aa -aa -aa hu aa "} @@ -8787,14 +8699,16 @@ hc hc hc hc -hc ho ho -ho -ho -ho -ho -hr +gP +gP +gP +gP +gP +gP +gP +gP gP gP gP @@ -8804,8 +8718,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -8813,14 +8725,16 @@ aa aa aa aa -aa hD hD -hD -hD -hD -hD -hF +he +he +he +he +he +he +he +he he he he @@ -8830,8 +8744,6 @@ he he hD aa -aa -aa hu aa "} @@ -8930,23 +8842,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc ho +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP ho -ho -ho -ho -ho -ho -ho -ho -hc -hc hc gO dJ @@ -8956,23 +8868,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa hD +he +he +he +he +he +he +he +he +he +he +he +he +he +he +he hD -hD -hD -hD -hD -hD -hD -hD -aa -aa aa hu aa @@ -9072,23 +8984,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +gP +gP +ho +ho hc gO dJ @@ -9098,23 +9010,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +he +he +hD +hD aa hu aa @@ -9226,10 +9138,10 @@ hc hc hc hc -hc -hc -hc -hc +ho +ho +ho +ho hc hc gO @@ -9252,10 +9164,10 @@ aa aa aa aa -aa -aa -aa -aa +hD +hD +hD +hD aa aa hu diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 7f47ce89185..653861507d1 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -10336,12 +10336,6 @@ "ayp" = ( /turf/space, /area/shuttle/excursion/tether_dockarm) -"ayq" = ( -/obj/effect/landmark{ - name = "carpspawn" - }, -/turf/space, -/area/shuttle/excursion/tether_dockarm) "ays" = ( /obj/structure/cable{ d1 = 1; @@ -25453,10 +25447,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25585,21 +25579,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25727,21 +25721,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25868,15 +25862,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp ayp ayp ayp @@ -26010,24 +26004,24 @@ aaa aaa aaa aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -aaa -aaa aaa aaa aaa @@ -26151,9 +26145,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26167,7 +26158,10 @@ ayp ayp ayp ayp -ayq +ayp +ayp +ayp +aab aaa aaa aaa @@ -26293,9 +26287,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +ayp +ayp +ayp ayp ayp ayp @@ -26435,9 +26429,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26450,7 +26441,10 @@ ayp ayp ayp ayp -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -26577,9 +26571,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26592,7 +26583,10 @@ ayp ayp ayp ayp -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -26719,9 +26713,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +ayp +ayp +ayp ayp ayp ayp @@ -26862,8 +26856,8 @@ aac aac cbM cbM -aaa -aaa +ayp +ayp ayp ayp ayp @@ -27004,8 +26998,8 @@ bYP bYP aac aac -aac -aaa +ayp +ayp ayp ayp ayp @@ -27147,8 +27141,8 @@ bYP aac aac aac -aaa -aaa +ayp +ayp ayp ayp ayp @@ -27289,14 +27283,14 @@ bYP aac aac aac -aac -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp ayp ayp ayp @@ -27443,8 +27437,8 @@ aaa bGo bHt bJl -aaa -aaa +ayp +ayp aaa aaa aaa @@ -37318,10 +37312,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -37450,21 +37444,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -37592,14 +37586,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -37733,9 +37727,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -37875,23 +37869,23 @@ aaa aaa aaa aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaa aaa aaa aaa @@ -38016,9 +38010,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38158,9 +38152,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa aaf aaf aaf @@ -38173,7 +38164,10 @@ aaf aaf aaf aaf -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -38300,9 +38294,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa aaf aaf aaf @@ -38315,7 +38306,10 @@ aaf aaf aaf aaf -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -38442,9 +38436,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38584,9 +38578,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38727,23 +38721,23 @@ aaa aaa aaa aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaa aaa aaa aaa @@ -38869,9 +38863,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -39012,14 +39006,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -39154,21 +39148,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -39308,8 +39302,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aaa aaa aaa diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index be0543942a9..b3c2bbdbd31 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1969,22 +1969,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"di" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/tether) "dj" = ( /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -2133,14 +2117,6 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/brown, /obj/structure/curtain/open/bed, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - icon_state = "alarm0"; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 - }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dz" = ( @@ -2470,12 +2446,16 @@ "ea" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "eb" = ( -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) + }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "ec" = ( @@ -2653,21 +2633,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"er" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -2745,16 +2710,6 @@ /turf/simulated/floor/tiled, /area/security/hallway) "ex" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/visible/supply, /turf/simulated/floor/tiled, @@ -2922,20 +2877,6 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/ai) -"eR" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "eS" = ( /obj/item/frame, /obj/effect/floor_decal/rust, @@ -3317,12 +3258,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) }, -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "fy" = ( @@ -3548,6 +3487,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fW" = ( @@ -6152,11 +6092,6 @@ dir = 1 }, /obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( @@ -6436,11 +6371,6 @@ /area/crew_quarters/heads/hos) "kw" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -6462,11 +6392,6 @@ master_tag = "expshuttle_docker"; pixel_y = -24 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ky" = ( @@ -6475,11 +6400,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kz" = ( @@ -6719,11 +6639,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kR" = ( @@ -28436,11 +28351,6 @@ /area/maintenance/station/elevator) "SO" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/closet/walllocker/emerglocker{ pixel_x = 32 }, @@ -28473,17 +28383,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) -"SR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ - dir = 1; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external"; - power_rating = 20000 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/area/shuttle/excursion/tether) "ST" = ( /obj/machinery/firealarm{ dir = 8; @@ -28502,7 +28404,7 @@ /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/airless/carry, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -28518,16 +28420,6 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "Ti" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/tiled, @@ -28544,7 +28436,7 @@ /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Tp" = ( /obj/structure/cable{ d1 = 1; @@ -28564,11 +28456,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Tu" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ icon_state = "intact-supply"; dir = 5 @@ -28598,10 +28485,8 @@ id_tag = "expshuttle_docker_pump_out_internal" }, /obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 +/obj/machinery/oxygen_pump{ + pixel_y = -32 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) @@ -28612,7 +28497,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "TO" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/secure/safe{ @@ -28634,21 +28519,14 @@ /turf/simulated/floor/wood, /area/security/breakroom) "TT" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/airlock/hatch{ + req_one_access = newlist() }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) -"TV" = ( -/obj/structure/table/steel, -/obj/item/clothing/head/pilot, -/turf/simulated/shuttle/floor/black, -/area/space) "TX" = ( /obj/machinery/alarm{ dir = 8; @@ -28667,15 +28545,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/exploration) -"Uk" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "Um" = ( /obj/machinery/sleep_console, /turf/simulated/floor/tiled, @@ -28694,11 +28563,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"Uo" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/space_heater, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Up" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -28746,11 +28610,6 @@ /area/security/eva) "Us" = ( /obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ frequency = 1441; @@ -28762,11 +28621,6 @@ /obj/machinery/computer/security, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"Uv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/shuttle/plating, -/area/space) "Uw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -28788,11 +28642,6 @@ /area/crew_quarters/heads/hos) "Uz" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/firealarm{ @@ -28803,18 +28652,14 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "UB" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "UC" = ( @@ -28834,10 +28679,6 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"UH" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/black, -/area/space) "UJ" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -28845,9 +28686,6 @@ }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) -"UK" = ( -/turf/simulated/wall/thull, -/area/tether/exploration) "UL" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -28858,11 +28696,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 10 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UM" = ( @@ -28872,7 +28705,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "UO" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -28893,12 +28726,7 @@ pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) -"UQ" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/darkred, -/area/space) +/area/shuttle/excursion/tether) "UR" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ dir = 8; @@ -28907,7 +28735,7 @@ power_rating = 20000 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -28963,20 +28791,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"UY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/space) -"UZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "Vd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -29018,7 +28832,7 @@ /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/pickaxe, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Vg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 8 @@ -29027,19 +28841,8 @@ dir = 1 }, /obj/structure/closet/crate/freezer/rations, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"Vi" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 - }, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Vl" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/floodlight, @@ -29067,12 +28870,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"Vo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/turf/simulated/wall/thull, -/area/tether/exploration) "Vp" = ( /obj/structure/cable/green{ d1 = 2; @@ -29081,19 +28878,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) -"Vq" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) -"Vs" = ( -/obj/machinery/door/airlock/voidcraft, -/turf/simulated/shuttle/floor/black, -/area/space) "Vu" = ( /obj/structure/flight_left, /turf/simulated/floor/tiled, @@ -29104,20 +28888,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"Vx" = ( -/turf/simulated/shuttle/floor/black, -/area/space) -"Vy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/space) -"VA" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "VB" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29132,8 +28902,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VD" = ( /obj/machinery/atmospherics/binary/pump, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -29146,7 +28917,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VI" = ( /obj/machinery/light{ dir = 4 @@ -29198,25 +28969,13 @@ dir = 10 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VR" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"VS" = ( -/obj/machinery/shuttle_sensor{ - dir = 6; - id_tag = "shuttlesens_exp_int" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "VU" = ( /obj/machinery/conveyor{ dir = 8; @@ -29245,13 +29004,6 @@ "Wg" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"Wj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Wk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29262,22 +29014,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"Wm" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ri" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "expshuttle_docker"; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Wn" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/thull, @@ -29285,17 +29021,7 @@ "Ws" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/wall/thull, -/area/tether/exploration) -"Wu" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -32 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "Wx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29310,8 +29036,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -29327,11 +29054,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"WC" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/turf/simulated/shuttle/floor/darkred, -/area/space) "WD" = ( /obj/structure/flight_right, /turf/simulated/floor/tiled, @@ -29344,40 +29066,9 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/exploration) -"WH" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"WJ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) -"WL" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"WQ" = ( -/obj/structure/bed/chair/comfy/blue{ - icon_state = "comfychair_preview"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "WR" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "WS" = ( @@ -29421,28 +29112,11 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) -"Xg" = ( -/obj/machinery/shuttle_sensor{ - dir = 2; - id_tag = "shuttlesens_exp_psg" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "Xi" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 9 }, @@ -29458,10 +29132,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 9 }, @@ -29493,14 +29163,7 @@ icon_state = "0-8" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) -"Xq" = ( -/obj/structure/bed/chair/shuttle{ - icon_state = "shuttle_chair"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "Xr" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29508,23 +29171,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/reinforced, -/area/tether/exploration) -"Xt" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) -"Xy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/area/shuttle/excursion/tether) "XA" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29534,7 +29181,7 @@ dir = 6 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XB" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29544,42 +29191,24 @@ dir = 10 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XE" = ( /obj/machinery/conveyor_switch/oneway{ id = "shuttle_inbound" }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XG" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/eva) -"XJ" = ( -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 4; - icon_state = "doorctrl0"; - id = "expshuttle_door_cargo"; - name = "hatch bolt control"; - pixel_x = -32; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/obj/machinery/door/airlock/multi_tile/metal{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_cargo"; - locked = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "XN" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29589,25 +29218,7 @@ dir = 1 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) -"XO" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_L"; - locked = 1 - }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 1; - icon_state = "doorctrl0"; - id = "expshuttle_door_L"; - name = "hatch bolt control"; - pixel_y = -28; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "XR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29621,13 +29232,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"XS" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "XT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29665,11 +29269,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 9 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Yi" = ( @@ -29703,16 +29302,6 @@ icon_state = "intact"; dir = 6 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold4w/visible/supply, /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, /turf/simulated/floor/tiled, @@ -29736,21 +29325,6 @@ }, /turf/simulated/floor/reinforced, /area/tether/exploration) -"Yx" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"YC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/shuttle/plating, -/area/space) "YD" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29793,12 +29367,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"YR" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{ - name = "\improper Shuttle Scrubber" - }, -/turf/simulated/shuttle/floor/darkred, -/area/space) "YT" = ( /turf/simulated/wall, /area/security/breakroom) @@ -29816,31 +29384,16 @@ }, /turf/space, /area/space) -"YY" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 32 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Za" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/airlock/hatch{ + req_one_access = newlist() }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) -"Zc" = ( -/turf/simulated/floor/reinforced, -/area/space) "Zd" = ( /obj/machinery/conveyor{ dir = 4; @@ -29848,29 +29401,6 @@ }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/tether/exploration) -"Zg" = ( -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Zk" = ( /obj/effect/floor_decal/industrial/warning{ @@ -29881,43 +29411,12 @@ /area/shuttle/excursion/tether) "Zo" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"Zv" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ro" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 4; - pixel_y = 28 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"Zw" = ( -/obj/machinery/light, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Zy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -29926,14 +29425,14 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZB" = ( /obj/machinery/shuttle_sensor{ dir = 5; id_tag = "shuttlesens_exp" }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZD" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -29959,34 +29458,22 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/machinery/meter, -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 +/obj/machinery/alarm{ + frequency = 1441; + pixel_y = 22 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"ZK" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) "ZL" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, @@ -29994,6 +29481,7 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "ZM" = ( @@ -30005,17 +29493,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) -"ZQ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/shuttle/floor/black, -/area/space) "ZT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) @@ -30027,17 +29510,12 @@ pixel_y = -26 }, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZX" = ( @@ -40751,8 +40229,8 @@ cK cK XE Zd -UK -UK +dj +dj cK ms Oz @@ -40881,19 +40359,19 @@ bX cE cK cK -UK -UK +dj +dj Wx -UK +dj Wx -UK +dj Wx -UK -UK -UK +dj +dj +dj Zy WG -UK +dj XA SY ms @@ -41023,10 +40501,10 @@ cp cE cK cK -UK +dj Tl ZU -UK +dj Vf VE Vw @@ -41164,7 +40642,7 @@ be bX cE cK -UK +dj dj dW UB @@ -41299,19 +40777,19 @@ aa aa aa aa -TV +aa aa aa be bX cE cK -di +VB dy dY Tu dj -eR +UE Wg YI dj @@ -41320,7 +40798,7 @@ Zk WR ZT iX -Vo +ZD cK ms nz @@ -41438,7 +40916,7 @@ aa aa aa aa -WC +aa aa aa aa @@ -41447,7 +40925,7 @@ aa be bX cE -UK +dj dj dj dj @@ -41459,7 +40937,7 @@ Vm dj Xa jZ -Vq +WR Xo XN SY @@ -41573,14 +41051,14 @@ aa aa aa aa -VA -VS -XO -VA -VA -ZK aa -Uo +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -41593,9 +41071,9 @@ VB Vu dC ea -er +fj ea -Uk +UE fj Ys ea @@ -41715,14 +41193,14 @@ aa aa aa aa -VA aa -WL -ZQ -YR -VA aa -UQ +aa +aa +aa +aa +aa +aa aa aa aa @@ -41857,12 +41335,12 @@ aa aa aa aa -VA aa -WL -ZQ -YR -VA +aa +aa +aa +aa +aa aa aa aa @@ -41877,7 +41355,7 @@ VB WD dE dj -Zg +fj dj dj fx @@ -41999,23 +41477,23 @@ aa aa aa aa -VA -aa -WL -Zw -ZK -VA aa aa aa aa -TV +aa +aa +aa +aa +aa +aa +aa aa aa be bX cE -UK +dj dj dj dj @@ -42141,12 +41619,12 @@ aa aa aa aa -Uv -Yx -XS -ZQ -XJ -Zc +aa +aa +aa +aa +aa +aa aa aa aa @@ -42158,7 +41636,7 @@ be bX cE cK -di +VB Tq ec Xk @@ -42283,12 +41761,12 @@ aa aa aa aa -Vs -Vx -Vx -ZQ -Vx -Zc +aa +aa +aa +aa +aa +aa aa aa aa @@ -42300,7 +41778,7 @@ be bX cE cK -UK +dj dj eg Xl @@ -42443,10 +41921,10 @@ cp cE cK cK -UK +dj UO Xp -UK +dj UM TJ ZX @@ -42585,19 +42063,19 @@ bX cE cK cK -UK -UK +dj +dj SQ -UK -UK -UK +dj +dj +dj UR UR VQ Ws ZE ZB -UK +dj XB SY ms @@ -42739,8 +42217,8 @@ cK cK cK cK -UK -UK +dj +dj cK ms mq @@ -42855,12 +42333,12 @@ aa aa aa aa -VA aa -Wm -WJ -WJ -SR +aa +aa +aa +aa +aa aa aa aa @@ -42997,12 +42475,12 @@ aa aa aa aa -VA aa aa aa -WH -SR +aa +aa +aa aa aa aa @@ -43139,12 +42617,12 @@ aa aa aa aa -VA aa aa aa -Vi -VA +aa +aa +aa aa aa aa @@ -43281,12 +42759,12 @@ aa aa aa aa -VA aa aa aa -Wj -VA +aa +aa +aa aa aa aa @@ -43423,12 +42901,12 @@ aa aa aa aa -VA -Xy -Zv -Xt -UZ -ZK +aa +aa +aa +aa +aa +aa aa aa aa @@ -43704,13 +43182,13 @@ aa aa aa aa -Zc -VA -YC -VA aa -VA -VA +aa +aa +aa +aa +aa +aa aa aa aa @@ -43846,12 +43324,12 @@ aa aa aa aa -VA -ZK aa -VA aa -Wu +aa +aa +aa +aa aa aa aa @@ -43988,12 +43466,12 @@ aa aa aa aa -Vy aa aa -VA aa -Vx +aa +aa +aa aa aa aa @@ -44130,13 +43608,13 @@ aa aa aa aa -Vy aa -WQ -Uv -UH -Vx -Xq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44274,11 +43752,11 @@ aa aa aa aa -Vx -Vs -Vx -Vx -Vx +aa +aa +aa +aa +aa aa aa aa @@ -44416,10 +43894,10 @@ aa aa aa aa -WQ -Uv -UH -Vx +aa +aa +aa +aa aa aa aa @@ -44558,11 +44036,11 @@ aa aa aa aa -Vx -Xg -UH -Vx -Xq +aa +aa +aa +aa +aa aa aa aa @@ -44698,13 +44176,13 @@ aa aa aa aa -VA -ZK aa -VA -UH -YY -Xq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44840,13 +44318,13 @@ aa aa aa aa -Zc -VA -UY -VA aa -VA -VA +aa +aa +aa +aa +aa +aa aa aa aa From 98fd57ae3cac929fc87fce9e0981f6fa73509a89 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2019 23:18:05 -0400 Subject: [PATCH 03/11] Final touches --- code/game/objects/structures/handrail_vr.dm | 8 + icons/obj/handrail_vr.dmi | Bin 0 -> 385 bytes maps/tether/tether-07-station3.dmm | 389 +++++++++++++------- maps/tether/tether_areas2.dm | 1 + vorestation.dme | 1 + 5 files changed, 263 insertions(+), 136 deletions(-) create mode 100644 code/game/objects/structures/handrail_vr.dm create mode 100644 icons/obj/handrail_vr.dmi diff --git a/code/game/objects/structures/handrail_vr.dm b/code/game/objects/structures/handrail_vr.dm new file mode 100644 index 00000000000..340d8dedd3d --- /dev/null +++ b/code/game/objects/structures/handrail_vr.dm @@ -0,0 +1,8 @@ +/obj/structure/handrail + name = "handrail" + icon = 'icons/obj/handrail_vr.dmi' + icon_state = "handrail" + desc = "A safety railing with buckles to secure yourself to when floor isn't stable enough." + density = 0 + anchored = 1 + can_buckle = 1 diff --git a/icons/obj/handrail_vr.dmi b/icons/obj/handrail_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b2fb153e07d46ee2dd22e0ce61e8a06d32c86089 GIT binary patch literal 385 zcmV-{0e=38P)H05ey;B9;IE00DGTPE!Ct=GbNc003=zR9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+BQY?O(p3`+M(y+AUsqcrzFOQDH6!S_-{k(wtw`OARKhlp5c z$2_P6kL%(yA(RCag3S!;tDH|b-lB@RZE6J#k0(xBy2Goq zp4x~6-IN!q5cLXXMgkYp*umV5l}}V*PJ$k7kt@ItmX8rwByjSBK6J1TgB&q#4=Xea f!8WLG`Xsyoe5?`?j1;PC00000NkvXXu0mjf+%1^+ literal 0 HcmV?d00001 diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index b3c2bbdbd31..79f39e75321 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2142,6 +2142,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dD" = ( @@ -2151,12 +2155,12 @@ name = "Shuttle Blast Doors"; pixel_x = 26; pixel_y = 39; - req_access = list(3) + req_access = list(67) }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled, @@ -2180,6 +2184,12 @@ rcon_setting = 3; report_danger_level = 0 }, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 6; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dF" = ( @@ -2441,6 +2451,10 @@ pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ea" = ( @@ -2453,8 +2467,8 @@ /obj/machinery/door/airlock/hatch{ req_one_access = list(67) }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) @@ -2509,6 +2523,12 @@ name = "Station Intercom (General)"; pixel_y = 27 }, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/toolbox/emergency, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "eh" = ( @@ -2710,8 +2730,8 @@ /turf/simulated/floor/tiled, /area/security/hallway) "ex" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/visible/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ey" = ( @@ -3049,27 +3069,27 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/empty, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "fj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, @@ -3248,20 +3268,20 @@ /turf/simulated/floor/tiled/dark, /area/security/security_processing) "fx" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/door/airlock/hatch{ req_one_access = list(67) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "fy" = ( @@ -3479,15 +3499,9 @@ dir = 1 }, /obj/structure/table/rack, -/obj/random/toolbox, -/obj/random/powercell, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/item/weapon/storage/belt/utility/full, +/obj/item/clothing/head/pilot, +/obj/item/clothing/head/pilot, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fW" = ( @@ -3909,6 +3923,9 @@ pixel_x = 0; pixel_y = -26 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "gM" = ( @@ -3919,6 +3936,7 @@ /obj/item/device/radio/intercom{ pixel_y = -24 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "gN" = ( @@ -4096,10 +4114,11 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8; + icon_state = "map" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "hd" = ( @@ -5475,13 +5494,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "iX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "iY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, /turf/simulated/wall/thull, @@ -5685,8 +5704,9 @@ /turf/simulated/floor, /area/maintenance/station/sec_upper) "jr" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -6087,11 +6107,12 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "jY" = ( +/obj/structure/closet/secure_closet/guncabinet/excursion, +/obj/effect/floor_decal/industrial/outline/red, /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; dir = 1 }, -/obj/structure/closet/secure_closet/guncabinet/excursion, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( @@ -6099,16 +6120,24 @@ icon_state = "warningcorner"; dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ka" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kb" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kc" = ( @@ -6204,8 +6233,9 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 2; frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = "expshuttle_vent" }, +/obj/structure/handrail, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kk" = ( @@ -6221,8 +6251,9 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 2; frequency = 1380; - id_tag = "expshuttle_vent" + id_tag = "expshuttle_docker_pump_out_internal" }, +/obj/structure/handrail, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kl" = ( @@ -6369,17 +6400,7 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"kw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "kx" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, /obj/machinery/door/airlock/glass_external{ frequency = 1380; icon_state = "door_locked"; @@ -6392,6 +6413,9 @@ master_tag = "expshuttle_docker"; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ky" = ( @@ -6956,10 +6980,15 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "lq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/recharger, /obj/structure/table/steel, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/item/weapon/pickaxe, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "lr" = ( @@ -27672,7 +27701,7 @@ /turf/simulated/mineral/vacuum, /area/quartermaster/office) "Rv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, /turf/simulated/wall/thull, @@ -28350,12 +28379,12 @@ /turf/simulated/floor, /area/maintenance/station/elevator) "SO" = ( -/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/closet/walllocker/emerglocker{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "SP" = ( @@ -28420,14 +28449,14 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "Ti" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/handrail{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Tl" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, @@ -28456,14 +28485,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Tu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ icon_state = "intact-supply"; dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "TD" = ( @@ -28482,12 +28514,15 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = "expshuttle_vent" }, /obj/structure/cable/cyan, /obj/machinery/oxygen_pump{ pixel_y = -32 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "TJ" = ( @@ -28522,8 +28557,8 @@ /obj/machinery/door/airlock/hatch{ req_one_access = newlist() }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) @@ -28535,15 +28570,28 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"TY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/light/small, +/obj/structure/handrail, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"Uf" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techfloor/grid, +"Ul" = ( +/obj/machinery/light, +/obj/structure/stasis_cage, +/turf/simulated/floor/tiled/monotile, /area/tether/exploration) "Um" = ( /obj/machinery/sleep_console, @@ -28641,14 +28689,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "Uz" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; layer = 3.3; pixel_x = 26 }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "UB" = ( @@ -28687,15 +28738,16 @@ /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "UL" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UM" = ( @@ -28716,8 +28768,6 @@ }, /obj/machinery/power/terminal, /obj/machinery/cell_charger, -/obj/item/clothing/head/pilot, -/obj/item/clothing/head/pilot, /obj/structure/table/steel, /obj/machinery/firealarm{ dir = 2; @@ -28725,6 +28775,10 @@ pixel_x = 0; pixel_y = 26 }, +/obj/random/powercell, +/obj/item/stack/material/tritium{ + amount = 5 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UR" = ( @@ -28767,13 +28821,14 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 2; frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = "expshuttle_vent" }, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, +/obj/structure/handrail, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UV" = ( @@ -28791,6 +28846,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Vb" = ( +/obj/machinery/camera/network/exploration{ + dir = 1 + }, +/obj/structure/stasis_cage, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "Vd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -28802,11 +28864,14 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; - id_tag = "expshuttle_vent" + id_tag = "expshuttle_docker_pump_out_internal" }, /obj/machinery/oxygen_pump{ pixel_y = -32 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Ve" = ( @@ -28821,7 +28886,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Vf" = ( -/obj/structure/table/rack/shelf, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -28830,24 +28894,43 @@ /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/pickaxe, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/structure/closet/emcloset/legacy, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Vg" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/structure/closet/crate/freezer/rations, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Vi" = ( +/obj/machinery/shuttle_sensor{ + dir = 2; + id_tag = "shuttlesens_exp_psg" + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) "Vl" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/floodlight, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Vm" = ( /obj/structure/bed/chair/shuttle{ icon_state = "shuttle_chair"; @@ -28965,8 +29048,9 @@ /turf/simulated/open, /area/ai_core_foyer) "VQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -28998,7 +29082,7 @@ dir = 4 }, /obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Wg" = ( @@ -29016,10 +29100,21 @@ /area/tether/exploration) "Wn" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/shuttle_sensor{ + dir = 5; + id_tag = "shuttlesens_exp_int" + }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) +"Wo" = ( +/obj/structure/bed/chair/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/tether) "Ws" = ( -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "Wx" = ( @@ -29098,6 +29193,9 @@ pixel_y = 24; req_access = list() }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xb" = ( @@ -29106,6 +29204,14 @@ }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) +"Xc" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) "Xe" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -29113,12 +29219,10 @@ /turf/simulated/floor/wood, /area/security/breakroom) "Xi" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) @@ -29132,10 +29236,10 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, @@ -29150,6 +29254,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xo" = ( @@ -29157,19 +29264,23 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xp" = ( -/obj/machinery/power/smes/buildable/outpost_substation, /obj/structure/cable/cyan{ d2 = 8; icon_state = "0-8" }, +/obj/machinery/power/smes/buildable/point_of_interest, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Xq" = ( +/obj/structure/stasis_cage, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "Xr" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, /turf/simulated/floor/reinforced, /area/shuttle/excursion/tether) "XA" = ( @@ -29177,7 +29288,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, /turf/simulated/floor/reinforced, @@ -29187,13 +29298,13 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, /turf/simulated/floor/reinforced, /area/shuttle/excursion/tether) "XC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, /turf/simulated/wall/thull, @@ -29214,7 +29325,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 1 }, /turf/simulated/floor/reinforced, @@ -29266,7 +29377,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -29290,20 +29401,23 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = "expshuttle_vent" }, /obj/machinery/oxygen_pump{ pixel_y = -32 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Ym" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - icon_state = "intact"; - dir = 6 +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" }, -/obj/machinery/atmospherics/pipe/manifold4w/visible/supply, -/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Ys" = ( @@ -29385,13 +29499,13 @@ /turf/space, /area/space) "Za" = ( -/obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/door/airlock/hatch{ req_one_access = newlist() }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "Zd" = ( @@ -29410,11 +29524,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Zo" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Zy" = ( @@ -29434,15 +29550,12 @@ /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "ZD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "ZE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, /obj/machinery/door/airlock/glass_external{ frequency = 1380; icon_state = "door_locked"; @@ -29457,27 +29570,31 @@ pixel_x = 4; pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/machinery/meter, /obj/machinery/alarm{ frequency = 1441; pixel_y = 22 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZL" = ( /obj/machinery/door/airlock/hatch{ req_one_access = list(67) }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; dir = 4 }, @@ -29512,22 +29629,22 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ZW" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZX" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible{ - icon_state = "intact"; - dir = 6 - }, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZY" = ( @@ -40517,7 +40634,7 @@ dj XN SY ms -mq +Xq be or RU @@ -40643,7 +40760,7 @@ bX cE cK dj -dj +ZB dW UB dj @@ -40659,7 +40776,7 @@ dj XN SY ms -nA +Vb be os oV @@ -40788,8 +40905,8 @@ VB dy dY Tu -dj -UE +Vi +Wo Wg YI dj @@ -40801,7 +40918,7 @@ iX ZD cK ms -nz +Ul be oS oS @@ -40943,7 +41060,7 @@ XN SY cK ms -mq +Xq be be be @@ -41079,8 +41196,8 @@ Ys ea iW ka -kw -Uf +WR +Xo XN SY cK @@ -41355,7 +41472,7 @@ VB WD dE dj -fj +TY dj dj fx @@ -42064,7 +42181,7 @@ cE cK cK dj -dj +Xc SQ dj dj diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index 3a2e9c84a75..23e80a6404b 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -572,6 +572,7 @@ name = "\improper Excursion Shuttle" icon_state = "shuttle2" base_turf = /turf/space + requires_power = 1 /area/shuttle/excursion/tether name = "\improper Excursion Shuttle - Tether" diff --git a/vorestation.dme b/vorestation.dme index 1dbc976d6c5..f123fd4e2d5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1216,6 +1216,7 @@ #include "code\game\objects\structures\girders.dm" #include "code\game\objects\structures\gravemarker.dm" #include "code\game\objects\structures\grille.dm" +#include "code\game\objects\structures\handrail_vr.dm" #include "code\game\objects\structures\holoplant.dm" #include "code\game\objects\structures\inflatable.dm" #include "code\game\objects\structures\janicart.dm" From fe5e198bf3a8ecc6d8be6d977bcb861002150c24 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 16 Aug 2019 00:30:22 -0400 Subject: [PATCH 04/11] Minor tweaks --- maps/tether/tether-07-station3.dmm | 76 +++++++++++++++++------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 79f39e75321..602dad13ba9 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -5490,7 +5490,6 @@ /turf/simulated/wall, /area/maintenance/cargo) "iW" = ( -/obj/machinery/recharge_station, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "iX" = ( @@ -6116,13 +6115,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ka" = ( @@ -6133,11 +6129,12 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kb" = ( -/obj/structure/handrail, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kc" = ( @@ -29061,16 +29058,22 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "VU" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "shuttle_outbound" - }, /obj/machinery/firealarm{ dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26 }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "shuttle_outbound" + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "VX" = ( @@ -29181,21 +29184,12 @@ /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) "Xa" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shuttle_outbound" - }, -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 8 - }, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/handrail, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xb" = ( @@ -29205,12 +29199,26 @@ /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "Xc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/wall/thull, +/turf/simulated/floor/plating, /area/shuttle/excursion/tether) "Xe" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29219,7 +29227,6 @@ /turf/simulated/floor/wood, /area/security/breakroom) "Xi" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; icon_state = "intact" @@ -29227,11 +29234,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xk" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, /obj/structure/cable/cyan{ d2 = 4; icon_state = "0-4" @@ -29243,6 +29245,12 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28; + req_access = list(67) + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Xl" = ( @@ -29517,8 +29525,9 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "Zk" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -29617,6 +29626,9 @@ icon_state = "alarm0"; pixel_y = -22 }, +/obj/structure/handrail{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZU" = ( @@ -42182,10 +42194,10 @@ cK cK dj Xc +dj +dj +dj SQ -dj -dj -dj UR UR VQ From 20b7a3c2f2c3348d7cd88bd9b923f33be970ec87 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 16 Aug 2019 00:52:45 -0400 Subject: [PATCH 05/11] Adds spotlights --- maps/tether/tether-07-station3.dmm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 602dad13ba9..6914ac67cab 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -3075,6 +3075,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"fh" = ( +/obj/machinery/light/spot{ + pixel_y = 32 + }, +/turf/simulated/wall/thull, +/area/shuttle/excursion/tether) "fi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; @@ -28514,9 +28520,6 @@ id_tag = "expshuttle_vent" }, /obj/structure/cable/cyan, -/obj/machinery/oxygen_pump{ - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, @@ -40771,7 +40774,7 @@ be bX cE cK -dj +fh ZB dW UB @@ -41907,7 +41910,7 @@ be bX cE cK -dj +fh dj eg Xl From c2b68fc3146038c2beca1ab69fb46d156d41929f Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 16 Aug 2019 01:07:45 -0400 Subject: [PATCH 06/11] Mounts wall vents externally --- maps/tether/submaps/aerostat/aerostat.dmm | 4 +- maps/tether/submaps/beach/beach.dmm | 4 +- maps/tether/submaps/space/debrisfield.dmm | 8 ++-- maps/tether/submaps/tether_ships.dmm | 58 +++++++++++------------ maps/tether/tether-05-station1.dmm | 8 ++-- maps/tether/tether-07-station3.dmm | 49 +++++++++---------- 6 files changed, 63 insertions(+), 68 deletions(-) diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm index 4ed1152b1cb..1832ba2faaa 100644 --- a/maps/tether/submaps/aerostat/aerostat.dmm +++ b/maps/tether/submaps/aerostat/aerostat.dmm @@ -6727,8 +6727,8 @@ aw aw aw aw -aw -aw +cv +cv aw cc cY diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index a9dd088557f..a3cc7e4e68b 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -10203,8 +10203,8 @@ aa aa aa aa -aa -aa +bm +bm aa aa aa diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm index 26c799cad5a..6c81a0e4acd 100644 --- a/maps/tether/submaps/space/debrisfield.dmm +++ b/maps/tether/submaps/space/debrisfield.dmm @@ -9478,7 +9478,7 @@ f f f f -b +f b b b @@ -9620,7 +9620,7 @@ f f f f -b +f b b c @@ -10608,8 +10608,8 @@ b b b b -b -b +f +f b b b diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm index 9d0817e6a98..52d69b9133a 100644 --- a/maps/tether/submaps/tether_ships.dmm +++ b/maps/tether/submaps/tether_ships.dmm @@ -5558,8 +5558,8 @@ eO eO eO eO -eO -eO +hd +hd eO eO eO @@ -5584,8 +5584,8 @@ hj hj hj hj -hj -hj +fg +fg hj hj hj @@ -5610,8 +5610,8 @@ hz hz hz hz -hz -hz +hq +hq hz hz hz @@ -5699,10 +5699,10 @@ gU gU gU gU -gU -gU -gU -gU +eO +eO +eO +eO gU eO eO @@ -5725,9 +5725,9 @@ et et et et -et -et -et +hj +hj +hj hj hj hj @@ -5751,10 +5751,10 @@ hp hp hp hp -hp -hp -hp -hp +hz +hz +hz +hz hp hz hz @@ -8992,8 +8992,8 @@ ho ho ho ho -ho -ho +gP +gP ho ho ho @@ -9018,8 +9018,8 @@ hD hD hD hD -hD -hD +he +he hD hD hD @@ -9133,10 +9133,10 @@ hc hc hc hc -hc -hc -hc -hc +ho +ho +ho +ho hc ho ho @@ -9159,10 +9159,10 @@ aa aa aa aa -aa -aa -aa -aa +hD +hD +hD +hD aa hD hD diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 653861507d1..3769e9c90f9 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -27432,8 +27432,8 @@ aac aac aaa aaa -aaa -aaa +ayp +ayp bGo bHt bJl @@ -39297,8 +39297,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aaa aaa aaa diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 6914ac67cab..e671db6ed89 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -4121,10 +4121,6 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "hd" = ( @@ -5708,13 +5704,6 @@ /obj/machinery/space_heater, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"jr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/wall/thull, -/area/shuttle/excursion/tether) "js" = ( /obj/machinery/light{ dir = 8 @@ -28588,6 +28577,18 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"Uf" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_external" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/excursion/tether) "Ul" = ( /obj/machinery/light, /obj/structure/stasis_cage, @@ -28782,11 +28783,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ - dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external"; - power_rating = 20000 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -29048,9 +29047,9 @@ /turf/simulated/open, /area/ai_core_foyer) "VQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8; + icon_state = "map" }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -29656,10 +29655,6 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZY" = ( @@ -42061,7 +42056,7 @@ UM TJ ZX hc -jr +dj kk kR Vd @@ -42201,7 +42196,7 @@ dj dj dj SQ -UR +dj UR VQ Ws @@ -42344,8 +42339,8 @@ cK cK cK cK -cK -cK +Uf +Uf cK cK cK From 5e4f3e7faa54ed82d4b17c52f32552bca4360fd7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Aug 2019 19:42:02 -0400 Subject: [PATCH 07/11] Rearranges and tidies things up --- maps/tether/tether-07-station3.dmm | 35 +++++++++++------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index e671db6ed89..1e13afc9d82 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2142,9 +2142,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) @@ -2176,20 +2177,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - icon_state = "alarm0"; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 - }, /obj/machinery/light_switch{ dir = 2; name = "light switch "; pixel_x = 6; pixel_y = 32 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dF" = ( @@ -2451,10 +2445,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ea" = ( @@ -2527,8 +2517,6 @@ icon_state = "bulb1"; dir = 1 }, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/toolbox/emergency, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "eh" = ( @@ -3508,6 +3496,8 @@ /obj/item/weapon/storage/belt/utility/full, /obj/item/clothing/head/pilot, /obj/item/clothing/head/pilot, +/obj/item/weapon/storage/box/survival/space, +/obj/item/weapon/storage/toolbox/emergency, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fW" = ( @@ -6101,12 +6091,11 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "jY" = ( -/obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/effect/floor_decal/industrial/outline/red, /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; dir = 1 }, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( @@ -6129,7 +6118,9 @@ /area/shuttle/excursion/tether) "kb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/closet/secure_closet/guncabinet/excursion, +/obj/item/weapon/pickaxe, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kc" = ( @@ -6980,7 +6971,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/obj/item/weapon/pickaxe, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "lr" = ( @@ -28567,8 +28557,8 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/light/small, /obj/structure/handrail, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Ub" = ( @@ -29476,6 +29466,7 @@ /obj/item/device/radio/intercom{ pixel_y = -24 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "YQ" = ( From f00778b59dca607183dc6d1b31384049822a2324 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Aug 2019 20:09:45 -0400 Subject: [PATCH 08/11] Changes airlock lighting --- maps/tether/tether-07-station3.dmm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 1e13afc9d82..22139ce5007 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -6237,6 +6237,10 @@ id_tag = "expshuttle_docker_pump_out_internal" }, /obj/structure/handrail, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kl" = ( @@ -28846,10 +28850,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; @@ -28861,6 +28861,10 @@ /obj/structure/handrail{ dir = 1 }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Ve" = ( From 8287ec9b8c59b6964f239b8e932a70ba9d6b55c1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Aug 2019 20:33:35 -0400 Subject: [PATCH 09/11] Adds another light in the atmos section --- maps/tether/tether-07-station3.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 22139ce5007..52a54bdc04d 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29591,6 +29591,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZL" = ( From f79b059289b987b47cbca2837ba9f8860e655210 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 19 Aug 2019 00:13:03 -0400 Subject: [PATCH 10/11] Readds a rear hatch --- maps/tether/tether-07-station3.dmm | 79 +++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 52a54bdc04d..a4422937380 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -6403,6 +6403,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ky" = ( @@ -6967,7 +6970,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "lq" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/recharger, /obj/structure/table/steel, /obj/machinery/light{ @@ -28420,6 +28422,15 @@ /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/excursion/tether) +"Tc" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -28577,10 +28588,10 @@ frequency = 1380; id_tag = "expshuttle_docker_pump_out_external" }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/handrail{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "Ul" = ( @@ -28732,6 +28743,13 @@ }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) +"UK" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "UL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -28912,6 +28930,27 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Vh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_external{ + icon_state = "door_locked"; + id_tag = "expshuttle_door_cargo"; + locked = 1 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + dir = 4; + icon_state = "doorctrl0"; + id = "expshuttle_door_cargo"; + name = "hatch bolt control"; + pixel_x = -32; + req_one_access = list(19,43,67); + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "Vi" = ( /obj/machinery/shuttle_sensor{ dir = 2; @@ -28920,8 +28959,8 @@ /turf/simulated/wall/thull, /area/shuttle/excursion/tether) "Vl" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/floodlight, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Vm" = ( @@ -29172,7 +29211,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "WY" = ( @@ -29280,12 +29321,8 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "Xr" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/turf/simulated/floor/reinforced, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow, +/turf/simulated/wall/thull, /area/shuttle/excursion/tether) "XA" = ( /obj/structure/shuttle/engine/heater, @@ -29317,7 +29354,9 @@ /obj/machinery/conveyor_switch/oneway{ id = "shuttle_inbound" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "XG" = ( @@ -29372,7 +29411,7 @@ "XZ" = ( /obj/machinery/computer/shuttle_control/web/excursion{ icon = 'icons/obj/computer.dmi'; - my_doors = list("expshuttle_door_L" = "Port Cargo", "expshuttle_door_Ro" = "Airlock Outer", "expshuttle_door_Ri" = "Airlock Inner", "expshuttle_door_cargo" = "Cargo Hatch"); + my_doors = list("expshuttle_door_Ro" = "Airlock Outer", "expshuttle_door_Ri" = "Airlock Inner", "expshuttle_door_cargo" = "Cargo Hatch"); my_sensors = list("shuttlesens_exp" = "Exterior Environment", "shuttlesens_exp_int" = "Cargo Area", "shuttlesens_exp_psg" = "Passenger Area") }, /turf/simulated/floor/tiled, @@ -29580,6 +29619,10 @@ dir = 9; icon_state = "intact" }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZG" = ( @@ -41205,9 +41248,9 @@ ea iW ka WR -Xo -XN -SY +UK +iY +dj cK ms mq @@ -41348,8 +41391,8 @@ SO Zo Xi Vl -XN -SY +Vh +Tc cK ms VX @@ -41491,7 +41534,7 @@ kb ZW lq Xr -SY +dj cK ms mq From d667f303048ad70f9504719730ba54b48ca5cd6d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 19 Aug 2019 00:18:38 -0400 Subject: [PATCH 11/11] Replaces hazard stripe --- maps/tether/tether-07-station3.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a4422937380..b647d36f91c 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29354,9 +29354,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "shuttle_inbound" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "XG" = (