diff --git a/maps/tether/submaps/om_ships/aro.dmm b/maps/tether/submaps/om_ships/aro.dmm index 58d679cb7b5..4f94d669280 100644 --- a/maps/tether/submaps/om_ships/aro.dmm +++ b/maps/tether/submaps/om_ships/aro.dmm @@ -1258,7 +1258,9 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/aro/centralarea) "cJ" = ( -/obj/machinery/shipsensors, +/obj/machinery/shipsensors{ + dir = 1 + }, /turf/space, /area/ship/aro/centralarea) "cK" = ( diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index f7666feebc9..7fd7ef1bad4 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -10938,6 +10938,7 @@ /area/mothership/telecomms2) "Su" = ( /obj/machinery/shipsensors{ + dir = 1; health = 1000; heat_reduction = 4.5; max_health = 1000; diff --git a/maps/tether/submaps/om_ships/hybridshuttle.dmm b/maps/tether/submaps/om_ships/hybridshuttle.dmm index da3c6fa8452..f197f819eb4 100644 --- a/maps/tether/submaps/om_ships/hybridshuttle.dmm +++ b/maps/tether/submaps/om_ships/hybridshuttle.dmm @@ -558,7 +558,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/blue_fo) "bq" = ( -/obj/machinery/shipsensors, +/obj/machinery/shipsensors{ + dir = 1 + }, /turf/simulated/shuttle/floor/alienplating/blue/half{ dir = 8 }, diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 021e131eb3f..da13978ae45 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -32519,7 +32519,9 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "uyk" = ( -/obj/machinery/shipsensors, +/obj/machinery/shipsensors{ + dir = 1 + }, /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index afcf64579a9..80c4b99ce11 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -9891,33 +9891,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/exploration) -"ot" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"ou" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "ov" = ( /obj/machinery/door/firedoor/glass, /obj/structure/lattice, @@ -10063,6 +10036,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "oF" = ( @@ -10801,8 +10779,13 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "pS" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/starboard) +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "pT" = ( /obj/structure/cable{ d1 = 1; @@ -10843,6 +10826,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/structure/sign/directions/evac{ + dir = 1; + pixel_x = 32; + pixel_y = 1 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "pV" = ( @@ -12496,6 +12484,10 @@ /obj/structure/sign/directions/elevator{ dir = 4 }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -8 + }, /turf/simulated/wall, /area/tether/station/stairs_two) "sy" = ( @@ -19230,6 +19222,7 @@ dir = 1 }, /obj/machinery/light, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Dx" = ( @@ -19325,12 +19318,19 @@ /turf/simulated/wall/r_wall, /area/ai_upload_foyer) "DI" = ( -/obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = 27 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -19371,22 +19371,6 @@ "DL" = ( /turf/simulated/wall, /area/hallway/station/starboard) -"DM" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DN" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/borderfloor{ @@ -20773,6 +20757,41 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Ir" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{ + frequency = 1380; + id_tag = "large_escape_pod_1"; + pixel_x = -26; + pixel_y = 26; + tag_door = "large_escape_pod_1_hatch" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) +"Is" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{ + frequency = 1380; + id_tag = "large_escape_pod_1_berth"; + pixel_x = 0; + pixel_y = -28; + tag_door = "escape_bay_1_door" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"Iw" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monofloor, +/area/hallway/station/starboard) "Ix" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -20808,6 +20827,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"IE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -28 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "IG" = ( /obj/machinery/firealarm{ dir = 2; @@ -20894,6 +20931,13 @@ /obj/structure/girder, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Jz" = ( +/obj/machinery/light, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "JD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -21118,6 +21162,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) +"LZ" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Mn" = ( /obj/structure/table/steel, /turf/simulated/floor, @@ -21350,6 +21398,10 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"Oe" = ( +/obj/structure/bed/chair/shuttle, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Oj" = ( /obj/machinery/alarm{ dir = 8; @@ -21372,6 +21424,18 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) +"Ov" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "OA" = ( /obj/effect/floor_decal/rust, /obj/random/trash, @@ -21391,6 +21455,12 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"OR" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "OY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21438,6 +21508,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"Pl" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monofloor{ + dir = 4 + }, +/area/hallway/station/starboard) "Pm" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -21446,6 +21522,13 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/security/brig) +"Pw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Py" = ( /obj/structure/bed/chair{ dir = 4 @@ -21575,6 +21658,13 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"Qq" = ( +/obj/structure/closet/walllocker/emerglocker/south, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Qs" = ( /turf/simulated/mineral/vacuum, /area/maintenance/station/sec_lower) @@ -21696,6 +21786,15 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"QU" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/airless, +/area/shuttle/large_escape_pod1) "QW" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21746,6 +21845,14 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Rv" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "RB" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -21809,6 +21916,18 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"RV" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "RW" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -21816,6 +21935,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"RX" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Sb" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -21965,6 +22095,28 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"TG" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/south, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) +"TM" = ( +/obj/structure/shuttle/window, +/obj/structure/grille, +/obj/effect/shuttle_landmark{ + base_area = /area/hallway/secondary/escape/medical_escape_pod_hallway; + base_turf = /turf/simulated/floor/plating; + docking_controller = "large_escape_pod_1_berth"; + landmark_tag = "escapepod1_station"; + name = "Tether Station" + }, +/turf/simulated/shuttle/plating, +/area/shuttle/large_escape_pod1) "TO" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -21997,6 +22149,18 @@ /obj/random/junk, /turf/simulated/mineral/floor/cave, /area/maintenance/station/sec_lower) +"Uh" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Ui" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -22014,6 +22178,28 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"Uj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = 27 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Uk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -22022,12 +22208,25 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Un" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + frequency = 1380; + id_tag = "escape_bay_1_door" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monofloor{ + dir = 8 + }, +/area/hallway/station/starboard) "Up" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"UD" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/shuttle/large_escape_pod1) "UE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -22112,6 +22311,14 @@ /obj/structure/lattice, /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) +"Vc" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/bed/chair/shuttle, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Vj" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/techfloor{ @@ -22218,6 +22425,13 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"VO" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "VU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -22233,6 +22447,12 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"VY" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monofloor{ + dir = 1 + }, +/area/hallway/station/starboard) "Wi" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -22289,6 +22509,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/engineering/shaft) +"WU" = ( +/obj/machinery/vending/wallmed1{ + layer = 3.3; + name = "Emergency NanoMed"; + pixel_x = 28; + pixel_y = 0 + }, +/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/bed/chair/shuttle, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Xc" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/syringes{ @@ -22481,6 +22712,9 @@ "Yw" = ( /turf/simulated/floor/airless, /area/mine/explored/upper_level) +"YC" = ( +/turf/simulated/shuttle/wall, +/area/shuttle/large_escape_pod1) "YD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ @@ -22516,6 +22750,28 @@ }, /turf/simulated/floor/plating, /area/security/brig) +"YH" = ( +/obj/machinery/status_display{ + density = 0; + layer = 4; + pixel_x = 0; + pixel_y = -32 + }, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) +"YI" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "large_escape_pod_1_hatch"; + locked = 1; + name = "Emergency Airlock" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "YK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -22574,6 +22830,11 @@ /obj/structure/closet/crate, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Zp" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Zr" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/techfloor{ @@ -22638,6 +22899,9 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"ZO" = ( +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "ZR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -33247,7 +33511,7 @@ lJ lJ li nN -pQ +IE DL ac ac @@ -35659,7 +35923,7 @@ kt kt kt kt -ni +Uj nR qC oY @@ -36938,8 +37202,8 @@ tF Dn DC Du -lJ -ou +Zp +DN oY pE et @@ -37080,8 +37344,8 @@ sV Dq DH Dv -lJ -ot +RX +DL oY oY oY @@ -37222,13 +37486,13 @@ vO hl hl DI -DM -DN +RX +DL pS -ac -ac -ac -ac +VO +VO +VO +Rv oY sW ef @@ -37363,14 +37627,14 @@ nn wp Dx hl +VY +Iw DL -DL -DL -pS -ac -ac -aa -aa +YC +QU +QU +QU +YC oY Ei sX @@ -37505,14 +37769,14 @@ np xX nv hl -ac -ac -ac -ac -ac -ac -aa -aa +kx +RX +DL +YC +Vc +OR +TG +YC oY oY oY @@ -37647,17 +37911,17 @@ or yt DB hl -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa +kx +RX +DL +YC +Oe +ZO +YH +YC +ab +ab +ab ab ab ab @@ -37789,14 +38053,14 @@ hl hl hl hl -ac -ac -ac -aa -aa -aa -aa -aa +kx +Is +DL +YC +Oe +ZO +Pw +YC aa aa aa @@ -37930,15 +38194,15 @@ ac ac ac ac -ac -ac -ac -aa -aa -aa -aa -aa -aa +DL +kx +RV +Un +YI +Ir +ZO +LZ +YC aa aa aa @@ -38072,15 +38336,15 @@ ac ac ac ac -ac -aa -aa -aa -aa -aa -aa -aa -aa +DL +Ov +Uh +Pl +YI +ZO +ZO +LZ +YC aa aa aa @@ -38214,15 +38478,15 @@ ac ac ac aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +DL +DL +DL +DL +YC +Oe +ZO +Jz +YC aa aa aa @@ -38360,11 +38624,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +YC +Oe +ZO +YH +YC aa aa aa @@ -38502,11 +38766,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +YC +WU +ZO +Qq +YC aa aa aa @@ -38644,11 +38908,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +YC +UD +ZO +UD +YC aa aa aa @@ -38787,9 +39051,9 @@ aa aa aa aa -aa -aa -aa +YC +TM +YC aa aa aa diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 26dbf466edc..04efeade5ed 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -7771,6 +7771,28 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"lY" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "lZ" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green, @@ -24960,6 +24982,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "My" = ( @@ -24975,6 +25000,13 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Mz" = ( @@ -25090,6 +25122,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "MM" = ( @@ -25397,6 +25434,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Nk" = ( @@ -25524,19 +25566,38 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 10 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "medivac_bay"; + pixel_x = -28; + tag_door = "medivac_bay_door" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Nv" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Nw" = ( @@ -25668,43 +25729,24 @@ /turf/simulated/floor/tiled, /area/security/hallway) "NF" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{ +/obj/machinery/door/airlock/glass_external{ frequency = 1380; - id_tag = "large_escape_pod_1_berth"; - pixel_x = -26; - pixel_y = 0; - tag_door = "large_escape_pod_1_berth_hatch" + id_tag = "medivac_bay_door" }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 10 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "NG" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + id_tag = "medivac_bay_door" }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "NH" = ( @@ -25743,19 +25785,26 @@ /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "NL" = ( -/turf/simulated/wall/r_wall, -/area/hallway/secondary/escape/medical_escape_pod_hallway) +/turf/simulated/wall/rshull, +/area/shuttle/medivac/engines) "NM" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; - icon_state = "door_locked"; - id_tag = "large_escape_pod_1_berth_hatch"; - locked = 1; - name = "Large Escape Pod 1" + id_tag = "medivac_out_door" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/hallway/secondary/escape/medical_escape_pod_hallway) +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 5; + frequency = 1380; + id_tag = "medivac_out_sensor"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) "NN" = ( /obj/structure/sink{ dir = 8; @@ -25820,25 +25869,57 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "NS" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/large_escape_pod1) -"NT" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "large_escape_pod_1_hatch"; - locked = 1; - name = "Emergency Airlock" +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"NU" = ( -/obj/structure/sign/redcross, -/turf/simulated/shuttle/wall, -/area/shuttle/large_escape_pod1) +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"NT" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2; + frequency = 1380; + id_tag = "medivac_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "medivac_docker"; + pixel_x = -28; + tag_airpump = "medivac_pump"; + tag_chamber_sensor = "medivac_c_sensor"; + tag_exterior_door = "medivac_out_door"; + tag_exterior_sensor = "medivac_out_sensor"; + tag_interior_door = "medivac_in_door"; + tag_interior_sensor = "medivac_in_sensor" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/shuttle_landmark{ + base_area = /area/mine/explored/upper_level; + base_turf = /turf/simulated/floor/airless; + docking_controller = "medivac_bay"; + landmark_tag = "tether_medivac_dock"; + name = "Medivac Bay" + }, +/obj/effect/overmap/visitable/ship/landable/medivac, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) "NV" = ( -/turf/simulated/mineral/floor/vacuum, -/area/hallway/secondary/escape/medical_escape_pod_hallway) +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "NW" = ( /turf/simulated/wall/r_wall, /area/medical/virology) @@ -25889,87 +25970,62 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "NZ" = ( -/obj/structure/shuttle/engine/heater{ - dir = 8 - }, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/floor/airless, -/area/shuttle/large_escape_pod1) +/turf/simulated/wall/rshull, +/area/shuttle/medivac/engines) "Oa" = ( -/obj/machinery/atmospherics/unary/cryo_cell{ - layer = 3.3 +/obj/machinery/atmospherics/binary/pump, +/obj/structure/fuel_port{ + pixel_x = -32 }, -/obj/structure/window/reinforced{ +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"Ob" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"Od" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + id_tag = "medivac_in_door" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) +"Oe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + id_tag = "medivac_in_door" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) +"Og" = ( +/obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Ob" = ( -/obj/structure/table/standard, -/obj/random/medical/lite, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4; - pixel_y = 0 +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Oc" = ( -/obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/weapon/tank/emergency/oxygen, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Od" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{ - frequency = 1380; - id_tag = "large_escape_pod_1"; - pixel_x = -26; - pixel_y = 26; - tag_door = "large_escape_pod_1_hatch" +/obj/structure/bed/chair/shuttle{ + dir = 4 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Oe" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Of" = ( -/obj/structure/bed/chair, /obj/machinery/light{ - dir = 1 + icon_state = "tube1"; + dir = 8 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Og" = ( -/obj/structure/bed/chair, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Oh" = ( -/obj/structure/bed/chair, -/obj/machinery/vending/wallmed1{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28; - pixel_y = 0 - }, -/obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Oi" = ( -/turf/simulated/shuttle/wall/hard_corner, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Oj" = ( /obj/structure/bed/padded, /obj/machinery/alarm{ @@ -26080,44 +26136,37 @@ /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "Os" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "Ot" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"Ou" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "Ov" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) -"Ow" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/obj/effect/shuttle_landmark{ - base_area = /area/hallway/secondary/escape/medical_escape_pod_hallway; - base_turf = /turf/simulated/floor/plating; - docking_controller = "large_escape_pod_1_berth"; - landmark_tag = "escapepod1_station"; - name = "Tether Station" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/large_escape_pod1) "Ox" = ( /turf/simulated/open, /area/tether/exploration) @@ -26224,101 +26273,76 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "OH" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 }, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/light, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"OI" = ( -/obj/machinery/atmospherics/unary/freezer{ - dir = 1; - icon_state = "freezer_1"; - use_power = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"OJ" = ( -/obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/weapon/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/weapon/storage/box/masks{ - pixel_x = 0; +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/storage/box/gloves{ - pixel_x = 3; - pixel_y = 4 +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"OI" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ - layer = 2.9; - pixel_x = 2; - pixel_y = 3 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = -2 +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"OJ" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 2; + icon_state = "door_closed"; + req_one_access = list(5,67) }, -/obj/machinery/status_display{ - density = 0; - layer = 4; - pixel_x = 0; - pixel_y = -32 +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/device/defib_kit/loaded, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/engines) "OK" = ( -/obj/machinery/sleeper{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"OM" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/blue/border, +/obj/effect/floor_decal/borderfloorwhite/corner2, +/obj/effect/floor_decal/corner/blue/bordercorner2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"ON" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"OL" = ( -/obj/machinery/sleep_console, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"OM" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 8 }, -/obj/machinery/light, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"ON" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) -"OO" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/structure/closet/walllocker/emerglocker/south, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "OP" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/item/device/radio/intercom/department/medbay{ @@ -29834,21 +29858,13 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/belter) -"VO" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) "VP" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/atmospherics/unary/engine{ + icon_state = "nozzle"; + dir = 4 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/airless, +/area/shuttle/medivac/engines) "VQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; @@ -29861,14 +29877,12 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) -"VS" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +"VT" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "VU" = ( /obj/machinery/firealarm{ dir = 2; @@ -29888,10 +29902,35 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"VV" = ( +/obj/machinery/sleep_console{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "VX" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"Wa" = ( +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "medivac_c_sensor"; + pixel_x = 28 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2; + frequency = 1380; + id_tag = "medivac_pump" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) "Wb" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -29920,6 +29959,11 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"Wj" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/blue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Wk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29930,6 +29974,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"Wl" = ( +/obj/structure/sign/redcross, +/turf/simulated/wall/rshull, +/area/shuttle/medivac/general) "Wm" = ( /obj/structure/cable{ d1 = 1; @@ -29975,6 +30023,13 @@ "Wt" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"Wu" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + id_tag = "medivac_out_door" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/general) "Wv" = ( /obj/machinery/alarm{ dir = 4; @@ -30004,6 +30059,35 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/general) +"Wy" = ( +/obj/machinery/door/window/brigdoor/westright{ + req_access = newlist(); + req_one_access = list(5,67) + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) +"WA" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + icon_state = "bordercolorcorner2"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -30019,6 +30103,13 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"WC" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + icon_state = "bay_chair_preview"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "WD" = ( /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled, @@ -30058,10 +30149,25 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "WL" = ( -/obj/machinery/shipsensors, +/obj/machinery/shipsensors{ + dir = 1 + }, /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/reinforced, /area/shuttle/excursion/general) +"WM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/structure/bed/padded, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/medivac/general) "WN" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -30090,6 +30196,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"WT" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + icon_state = "warningcorner_dust"; + dir = 1 + }, +/turf/simulated/floor/airless, +/area/mine/explored/upper_level) "WV" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -30100,6 +30213,12 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/excursion/cargo) +"WW" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/medivac/general) "WY" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -30141,12 +30260,35 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/general) +"Xd" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/computer/shuttle_control/explore/medivac{ + icon_state = "computer"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "Xe" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/wood, /area/security/breakroom) +"Xg" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "medivac blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/airless, +/area/shuttle/medivac/general) "Xh" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -30167,6 +30309,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"Xj" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Xk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -30233,6 +30390,32 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/general) +"Xv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"Xw" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"Xx" = ( +/obj/machinery/computer/ship/engines, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) +"Xy" = ( +/turf/simulated/wall/rshull, +/area/shuttle/medivac/cockpit) "Xz" = ( /obj/machinery/atmospherics/unary/engine{ dir = 1 @@ -30263,10 +30446,24 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"XF" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "XG" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/eva) +"XH" = ( +/obj/machinery/shipsensors{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/airless, +/area/shuttle/medivac/cockpit) "XM" = ( /obj/structure/table/glass, /turf/simulated/floor/wood, @@ -30327,13 +30524,44 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"XW" = ( +/obj/machinery/door/window/brigdoor/westleft{ + req_access = newlist(); + req_one_access = list(5,67) + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "XZ" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) +"Ya" = ( +/turf/simulated/wall/rshull, +/area/shuttle/medivac/general) "Yb" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) +"Yc" = ( +/obj/structure/sign/redcross, +/turf/simulated/wall/rshull, +/area/shuttle/medivac/engines) +"Ye" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "Yf" = ( /obj/machinery/computer/supplycomp/control, /turf/simulated/floor/wood, @@ -30379,6 +30607,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"Yk" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/airless, +/area/mine/explored/upper_level) +"Yl" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Ym" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -30403,6 +30652,35 @@ can_open = 0 }, /area/crew_quarters/medical_restroom) +"Yq" = ( +/obj/machinery/body_scanconsole{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/blue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"Yr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9; + icon_state = "intact" + }, +/obj/machinery/airlock_sensor{ + command = "cycle_interior"; + frequency = 1380; + id_tag = "medivac_in_sensor"; + pixel_x = 28; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"Ys" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/tiled/dark, +/area/shuttle/medivac/general) "Yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30412,6 +30690,18 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"Yv" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "Yw" = ( /obj/structure/cable/green{ d1 = 4; @@ -30432,6 +30722,19 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/crew_quarters/medical_restroom) +"YA" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/blue/border{ + icon_state = "bordercolor"; + dir = 9 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "YB" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -30477,6 +30780,36 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/general) +"YM" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"YN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) +"YO" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "YQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -30490,9 +30823,36 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"YS" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/medivac/engines) "YT" = ( /turf/simulated/wall, /area/security/breakroom) +"YU" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/obj/structure/table/glass, +/obj/machinery/recharger, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "YV" = ( /obj/machinery/computer/secure_data, /obj/machinery/alarm{ @@ -30507,6 +30867,18 @@ }, /turf/space, /area/space) +"YY" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/engines) "Za" = ( /obj/machinery/door/airlock/hatch{ req_one_access = newlist() @@ -30522,6 +30894,19 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/cargo) +"Zc" = ( +/obj/machinery/computer/ship/helm{ + icon_state = "computer"; + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "Zd" = ( /obj/machinery/conveyor{ dir = 4; @@ -30530,6 +30915,20 @@ /obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"Ze" = ( +/obj/structure/sign/redcross{ + pixel_x = 16; + pixel_y = -16; + plane = -45 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) +"Zg" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/mine/explored/upper_level) "Zi" = ( /obj/machinery/alarm{ dir = 1; @@ -30549,6 +30948,17 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) +"Zm" = ( +/obj/machinery/computer/ship/sensors{ + icon_state = "computer"; + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "Zn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30578,10 +30988,38 @@ }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) +"Zr" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "Zs" = ( /obj/structure/bookcase, /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) +"Zt" = ( +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 2; + name = "south bump"; + pixel_y = -28; + req_access = list(67) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 10 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/structure/cable, +/turf/simulated/floor/tiled/white, +/area/shuttle/medivac/general) "Zu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30591,6 +31029,23 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) +"Zv" = ( +/obj/machinery/door/firedoor/glass, +/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 = "medivac blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/airless, +/area/shuttle/medivac/cockpit) "Zx" = ( /obj/machinery/light/small{ dir = 8 @@ -30606,6 +31061,19 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"Zz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + icon_state = "borderfloorcorner2_black"; + dir = 8 + }, +/obj/machinery/door/window/brigdoor/northleft{ + req_access = list(5) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/medivac/general) "ZB" = ( /obj/machinery/shuttle_sensor{ dir = 5; @@ -30654,6 +31122,21 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) +"ZK" = ( +/obj/structure/bed/chair/bay/chair/padded/blue{ + icon_state = "bay_chair_preview"; + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "medivac blast"; + name = "Shuttle Blast Doors"; + pixel_x = -28; + pixel_y = -28; + req_access = list(67) + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "ZL" = ( /obj/machinery/door/airlock/hatch{ req_one_access = list(67) @@ -30690,6 +31173,23 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) +"ZR" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "medivac blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/airless, +/area/shuttle/medivac/general) "ZT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/alarm{ @@ -40213,16 +40713,16 @@ Mw Lh Ni Iy -ab -NL -NL -NL -NL -NL -NL -NL -vt -vt +vs +vs +vs +vs +vs +vs +vs +vs +vs +Yk Pz aa PL @@ -40355,18 +40855,18 @@ Iy MK MK Iy -ab +vs NL -VO -VP -VP -VP -VS NL -vt -vt -gg -gg +NL +VP +VP +NL +NL +NL +Yk +vs +vs aa aa aa @@ -40497,18 +40997,18 @@ Iy MK MK Iy -ab +vs NL NS +NL NZ NZ -NZ +NL NS NL -vt -vt -gg -gg +Yk +vs +vs aa aa aa @@ -40639,18 +41139,18 @@ Iy MK MK Iy -ab -NL -NS +vs +Yc +YN Oa Os OH -NS -NL -vt -vt -gg -gg +Yv +Ye +Yc +Yk +vs +vs aa aa aa @@ -40781,18 +41281,18 @@ Iy MK MK Iy -ab +vs NL -NS +VT Ob Ot OI -NS +YS +XF NL -vt -vt -gg -gg +Yk +vs +vs aa aa aa @@ -40925,16 +41425,16 @@ Lu Lu Lu NL -NS -Oc -Oe -OJ -NS NL -vt -vt -gg -gg +NL +YY +OJ +NL +NL +NL +Yk +vs +vs aa aa aa @@ -41069,14 +41569,14 @@ NF NM NT Od -Oe +Xv OK -NS -NL -vt -gg -gg -gg +Zz +WW +Ya +Yk +vs +vs aa aa aa @@ -41208,17 +41708,17 @@ MM Jk Nv NG -NM -NT +Wu +Wa Oe -Oe -OL -NS -NL -gg -gg -gg -gg +Yr +OK +WM +Ys +Ya +Yk +vs +vs aa aa aa @@ -41350,16 +41850,16 @@ Lu Lu Lu Lu -NL -NU -Of -Oe +Ya +Ya +Ya +WA OM -NU -NL -gg -aa -aa +Ya +Ya +Ya +Yk +vs aa aa aa @@ -41491,17 +41991,17 @@ AH ab ab ab -ab -NL -NS +vs +Ya +YA Og -Oe +Xw ON -NS -NL -gg -aa -aa +lY +Zt +Ya +Yk +vs aa aa aa @@ -41633,16 +42133,16 @@ AH ab ab ab -ab -NL -NS +vs +ZR +YO Oh -Oe -OO -NS -NL -gg -aa +Ze +OK +Oh +Wj +Xg +Yk aa aa aa @@ -41775,16 +42275,16 @@ AH ab ab ab -ab -NL -NS -Oi -Ou -Oi -NS -NL -gg -aa +vs +ZR +VV +Oh +Oh +OK +Oh +Yq +Xg +Yk aa aa aa @@ -41917,16 +42417,16 @@ AH ab ab ab -ab -NL +vs +Wl NV -NS -Ow -NS -NV -NL -gg -aa +Xj +Oh +OK +Yl +YM +Wl +Yk aa aa aa @@ -42060,15 +42560,15 @@ ab ab ab ab -vt -vt -vt -vt -vt -vt -vt -gg -aa +Xy +Xy +YU +Wy +XW +Zr +Xy +Xy +Yk aa aa aa @@ -42202,15 +42702,15 @@ ab ab ab ab -vt -vt -vt -vt -vt -vt -vt -gg -aa +XH +Xy +Xx +WC +ZK +Xd +Xy +vs +Yk aa aa aa @@ -42344,15 +42844,15 @@ ab ab ab ab -vt -vt -vt -vt -vt -vt -vt -aa -aa +vs +Xy +Xy +Zc +Zm +Xy +Xy +vs +Yk aa aa aa @@ -42485,16 +42985,16 @@ ab ab ab ab -vt -vt -vt -vt -vt -vt -vt -vt -aa -aa +vs +vs +vs +Xy +Zv +Zv +Xy +vs +vs +Yk aa aa aa @@ -42627,16 +43127,16 @@ ab ab ab ab -vt -vt -vt -vt -vt -vt -vt -vt -aa -aa +Zg +Zg +Zg +Zg +Zg +Zg +Zg +Zg +Zg +WT aa aa aa @@ -42769,11 +43269,11 @@ ab ab ab ab -vt -vt -vt -vt -vt +vs +vs +vs +vs +vs vt vt vt diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 507bd65aff2..bfd9246d10c 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1053,6 +1053,18 @@ /area/shuttle/tourbus/engines name = "\improper Tour Bus Engines" +/area/shuttle/medivac + requires_power = 1 + icon_state = "shuttle2" + +/area/shuttle/medivac/general + name = "\improper Medivac" + +/area/shuttle/medivac/cockpit + name = "\improper Medivac Cockpit" + +/area/shuttle/medivac/engines + name = "\improper Medivac Engines" // Belter Dock diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 617369c755c..27fcb9fa0ab 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -247,8 +247,16 @@ "tether_space_NE", //station1, top right of space, "tether_space_SW", //station3, bottom left of space, "tether_excursion_hangar", //Excursion shuttle hangar, + "tether_medivac_dock", //Medical shuttle dock, "tourbus_dock" //Surface large hangar ) + //Despite not being in the multi-z complex, these levels are part of the overmap sector + extra_z_levels = list( + Z_LEVEL_SURFACE_MINE, + Z_LEVEL_SOLARS, + Z_LEVEL_PLAINS, + Z_LEVEL_UNDERDARK + ) /obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM) . = ..() diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 270c16461e7..3687ba61bb6 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -226,3 +226,28 @@ name = "short jump console" shuttle_tag = "Tour Bus" req_one_access = list(access_pilot) + +//////////////////////////////////////// +//////// Medivac ///////////// +//////////////////////////////////////// +/datum/shuttle/autodock/overmap/medivac + name = "Medivac Shuttle" + warmup_time = 0 + current_location = "tether_medivac_dock" + docking_controller_tag = "medivac_docker" + shuttle_area = list(/area/shuttle/medivac/cockpit, /area/shuttle/medivac/general, /area/shuttle/medivac/engines) + fuel_consumption = 1 + +// The 'ship' of the excursion shuttle +/obj/effect/overmap/visitable/ship/landable/medivac + name = "Medivac Shuttle" + desc = "A medical evacuation shuttle." + vessel_mass = 3000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Medivac Shuttle" + fore_dir = EAST + +/obj/machinery/computer/shuttle_control/explore/medivac + name = "short jump console" + shuttle_tag = "Medivac Shuttle" + req_one_access = list(access_pilot)