diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 24d7fae89e..8235e79065 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -204,11 +204,7 @@ /turf/simulated/floor/tiled/dark, /area/security/range) "aav" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ @@ -216,16 +212,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/command{ - id_tag = "HoSdoor"; - name = "Head of Security"; - req_access = list(58) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/door/airlock/glass_security, +/turf/simulated/floor/tiled, +/area/security/hallway) "aaw" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -1891,9 +1886,13 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "acZ" = ( -/obj/structure/filingcabinet, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled, +/area/security/hallway) "ada" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -3244,13 +3243,6 @@ /area/security/hallway) "aff" = ( /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ @@ -3258,8 +3250,27 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "afg" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -3410,10 +3421,6 @@ /obj/structure/cable/green, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"afs" = ( -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, -/area/security/hallway) "aft" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -7785,23 +7792,13 @@ /turf/simulated/floor, /area/crew_quarters/heads/hos) "ama" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/turf/simulated/floor, -/area/security/breakroom) +/obj/machinery/door/airlock/glass_security, +/turf/simulated/floor/tiled, +/area/security/hallway) "amb" = ( /obj/structure/grille, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, +/obj/structure/window/reinforced/full, /turf/simulated/floor, /area/security/forensics) "amc" = ( @@ -8169,32 +8166,6 @@ /obj/structure/closet/wardrobe/red, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"amE" = ( -/obj/structure/grille, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/turf/simulated/floor, -/area/security/forensics) -"amF" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/turf/simulated/floor, -/area/security/forensics) "amG" = ( /obj/structure/window/reinforced{ dir = 4 @@ -8271,14 +8242,6 @@ }, /turf/simulated/floor, /area/lawoffice) -"amK" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/red/bordercorner2, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/security/hallway) "amL" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -9102,13 +9065,9 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "aoa" = ( -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) @@ -9676,24 +9635,35 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "apa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "apb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9709,6 +9679,25 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/hallway) "apc" = ( @@ -10114,13 +10103,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"apC" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "apD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -28277,13 +28259,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "aSz" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled, +/area/security/hallway) "aSA" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; @@ -29170,19 +29152,26 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "aUn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/turf/simulated/floor/tiled, +/area/security/hallway) "aUo" = ( /obj/structure/cable/green{ d1 = 4; @@ -31780,9 +31769,6 @@ /obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) -"aZF" = ( -/turf/simulated/mineral/vacuum, -/area/crew_quarters/heads/hos) "aZG" = ( /obj/machinery/computer/shuttle_control/explore/excursion{ dir = 1; @@ -32327,16 +32313,863 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/mining_outpost/shuttle) +"boY" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/general) +"bpl" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"bvH" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"bDn" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 4; + frequency = 1380; + id_tag = "securiship_docker"; + pixel_x = -28 + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/airlock_sensor{ + pixel_y = 28 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "securiship_bay"; + landmark_tag = "tether_securiship_dock"; + name = "Securiship Dock" + }, +/obj/effect/overmap/visitable/ship/landable/securiship, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/general) +"cwr" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/table/rack/shelf, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"cNP" = ( +/obj/machinery/computer/ship/helm{ + req_one_access = list(67,58) + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"deE" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"doX" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/bed/chair/bay/chair/padded/beige{ + icon_state = "bay_chair_preview"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"dSk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/camera/network/security, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"ebj" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled, +/area/security/hallway) +"exP" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"ePT" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"eZd" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "securiship blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/general) +"eZt" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/table/rack/shelf, +/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/techmaint, +/area/shuttle/securiship/general) +"fxI" = ( +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/structure/filingcabinet, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"fGQ" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"gjM" = ( +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/general) +"gkR" = ( +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + icon_state = "intact-fuel"; + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"gxX" = ( +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"gBp" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/bay/chair{ + icon_state = "bay_chair_preview"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"gJa" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/engines) +"gSE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + icon_state = "intact-fuel"; + dir = 10 + }, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) "gUi" = ( /obj/effect/decal/cleanable/dirt, /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/ai) +"hoF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + icon_state = "map-fuel"; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"hyn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + icon_state = "intact-fuel"; + dir = 6 + }, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) +"hEY" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"ifk" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/security/hallway) +"isz" = ( +/turf/simulated/wall/rshull, +/area/shuttle/securiship/general) +"iUO" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"jjJ" = ( +/obj/machinery/power/terminal{ + icon_state = "term"; + dir = 1 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"jnQ" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"jrx" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/fuel_port{ + dir = 1 + }, +/turf/simulated/floor/tiled/monofloor{ + dir = 1 + }, +/area/shuttle/securiship/engines) +"jxg" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/command{ + id_tag = "HoSdoor"; + name = "Head of Security"; + req_access = list(58) + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"jHa" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"klB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + icon_state = "intact-fuel"; + dir = 5 + }, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"kqS" = ( +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + icon_state = "intact-aux"; + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"kAs" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"lmZ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/general) +"lFr" = ( +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/engines) +"lMN" = ( +/obj/structure/grille, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"mxs" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/floor/airless, +/area/shuttle/securiship/general) +"mLa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"nig" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"nin" = ( +/obj/structure/bed/chair/bay/chair{ + icon_state = "bay_chair_preview"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"nqE" = ( +/obj/machinery/computer/ship/sensors{ + icon_state = "computer"; + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"ntp" = ( +/obj/machinery/computer/ship/engines{ + icon_state = "computer"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"nym" = ( +/obj/machinery/computer/shuttle_control/explore/securiship{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"okJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + icon_state = "intact-fuel"; + dir = 8 + }, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) +"oEa" = ( +/obj/structure/bed/chair/bay/chair/padded/beige{ + icon_state = "bay_chair_preview"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"oGF" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled, +/area/security/hallway) +"oHo" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"oJa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + icon_state = "intact-aux"; + dir = 6 + }, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/general) +"plY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + icon_state = "map-fuel"; + dir = 1 + }, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) +"pYS" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "securiship blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/general) +"qwY" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/bed/chair/bay/chair/padded/beige, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"qDa" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"rfZ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 4; + pixel_x = 0; + pixel_y = -28 + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/general) +"rgV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"rhI" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"rlz" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"rBj" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "securiship blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/cockpit) +"rFu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + icon_state = "intact-aux"; + dir = 8 + }, +/obj/machinery/airlock_sensor{ + pixel_y = 28 + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"rIa" = ( +/obj/structure/cable/green{ + icon_state = "1-2"; + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"rUg" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"sio" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"sYy" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + icon_state = "map_connector-fuel"; + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) +"tqy" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"trD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/general) +"uzs" = ( +/obj/machinery/shipsensors{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/airless, +/area/shuttle/securiship/cockpit) +"vlw" = ( +/obj/machinery/door/window/brigdoor/eastleft, +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"vqZ" = ( +/turf/simulated/wall/rshull, +/area/shuttle/securiship/cockpit) +"vsJ" = ( +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"vyd" = ( +/obj/machinery/light, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/binary/pump/fuel, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/engines) "vFD" = ( /obj/structure/catwalk, /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"wIZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"wRu" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/structure/bed/chair/bay/chair/padded/beige{ + icon_state = "bay_chair_preview"; + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + dir = 2; + id = "securiship blast"; + name = "Shuttle Blast Doors"; + pixel_x = -28; + pixel_y = 28; + req_access = list(67) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/securiship/cockpit) +"xaA" = ( +/obj/structure/grille, +/obj/structure/cable/green, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"xeo" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) +"xmG" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"xny" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/airless, +/area/shuttle/securiship/engines) +"xou" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/tiled/dark, +/area/shuttle/securiship/general) +"xqB" = ( +/turf/simulated/wall/rshull, +/area/shuttle/securiship/engines) +"yau" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + icon_state = "intact-aux"; + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/securiship/general) +"ygj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 2; + frequency = 1380; + id_tag = "securiship_bay"; + pixel_x = -22; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) (1,1,1) = {" aaa @@ -34523,19 +35356,19 @@ aaa aaa aaa aaa +aad +aad +aae +aot +aad +aad +aae +aad +aad +aad aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad aaa aaa aaa @@ -34662,25 +35495,25 @@ aaa aaa aaa aaa +aad aaa aaa aaa aaa +aae aaa aaa aaa +aae aaa aaa +aae +aae +aae +aad aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad aaa aaa aaa @@ -34804,25 +35637,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae aaa aaa aaa @@ -34946,6 +35779,8 @@ aaa aaa aaa aaa +aad +aae aaa aaa aaa @@ -34962,10 +35797,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aae +aad aaa aaa aaa @@ -35089,25 +35922,25 @@ aaa aaa aaa aaa +aae aaa +uzs +vqZ +vqZ +vqZ +isz +pYS +pYS +isz +isz +xqB +xqB +xqB +xqB +xqB aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae +aad aaa aaa aaa @@ -35229,27 +36062,27 @@ aaa aaa aaa aaa +aad aaa +aae aaa +vqZ +vqZ +ntp +oHo +doX +oEa +fGQ +vsJ +nin +xqB +ePT +jjJ +hyn +xny aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae +aad aaa aaa aaa @@ -35371,27 +36204,27 @@ aaa aaa aaa aaa +aad +aae +aae aaa +rBj +cNP +wRu +nig +kAs +kAs +xou +vlw +gBp +xqB +gxX +bpl +plY +xny aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae +aad aaa aaa aaa @@ -35513,27 +36346,27 @@ aaa aaa aaa aaa +aad aaa +aae aaa +rBj +bvH +nqE +wIZ +jHa +rhI +qwY +jHa +jHa +gJa +sio +jrx +okJ +xqB aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae +aad aaa aaa aaa @@ -35657,24 +36490,24 @@ aaa aaa aaa aaa +aae aaa +isz +qDa +rUg +deE +hEY +yau +kAs +exP +rIa +lFr +gkR +vyd +xeo +xqB aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae aaa aaa aaa @@ -35799,27 +36632,27 @@ aad aaa agm aaa -aad -aad aae -aot -aad -aad +aaa +isz +isz +isz +isz +isz +rFu +kAs +cwr +oEa +xqB +hoF +klB +plY +xny +aaa aae aad aad aad -aae -aad -aad -aad -aae -aad -aad -aad -aae -aad -aad aad aae aad @@ -35941,27 +36774,27 @@ aae aaa aae aaa +aae aaa +oJa +trD +bDn +gjM +boY +kqS +rIa +eZt +nym +xqB +sYy +sYy +gSE +xny aaa aae aaa aaa aaa -aae -aaa -aaa -aaa -aae -aaa -aaa -aaa -aae -aaa -aaa -aaa -aae -aaa -aaa aaa aae aaa @@ -36084,22 +36917,22 @@ aae aae aae aae -aae -aae -aae -aae -aae -aYW -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +aaa +mxs +isz +lmZ +rfZ +isz +eZd +eZd +isz +eZd +xqB +xqB +xqB +xqB +xqB +aaa aae aae aae @@ -36216,10 +37049,7 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aZF +aab aje aje aje @@ -36231,6 +37061,9 @@ aje aje alj alZ +aje +ebj +oGF aqc aqv ard @@ -36239,7 +37072,7 @@ asL atG auF aaa -aae +aaa aaa aaa aaa @@ -36357,11 +37190,8 @@ aab aaa aaa aaa -aaa -aaa -aaa aab -aZF +aab aje aLS aWH @@ -36373,6 +37203,9 @@ anW aTO aoW aZM +tqy +ygj +atY amb aqw are @@ -36381,7 +37214,7 @@ afO atH auG avs -aae +aaa aaa aJW axv @@ -36501,9 +37334,6 @@ aab aab aab aab -aab -aab -aZF aje aUi aiS @@ -36515,7 +37345,10 @@ anX aTW aoX aSc -amE +lMN +mLa +apG +amb aqx arf asb @@ -36523,7 +37356,7 @@ asM atI auI avs -aae +aaa aaa axv axw @@ -36643,9 +37476,6 @@ aab aab aab aab -aab -aab -aZF aje aje aje @@ -36657,7 +37487,10 @@ aRq aYC akv aSP -amF +xmG +mLa +apG +amb aqy arg asc @@ -36788,9 +37621,6 @@ aab aab aab aab -aab -aab -aab aje aVK ajM @@ -36799,6 +37629,9 @@ aeG aov aoZ afr +aje +dSk +ifk aqc amG arh @@ -36930,15 +37763,15 @@ aao aao aao aab -aab -aab -aab aje aYV ajM aTD aeH aow +rlz +rgV +jxg aUn acZ amb @@ -37072,18 +37905,18 @@ aao aao aao aab -aab -aab -aab aje ahd aWN aet aYx aWh +jnQ +iUO +xaA apa aSz -amE +amb aqA arj ase @@ -37214,18 +38047,18 @@ aju aju aao aab -aab -aab -aab aje akI aUy akO -aoa +fxI aox +amy +aoa +xmG aff -apC -amF +atT +amb aqB ark asf @@ -37508,7 +38341,7 @@ anH aob amh apb -afs +atY aqe aqD arm @@ -37650,7 +38483,7 @@ anI aoc afd apc -anN +apG aqe aqE arm @@ -37792,7 +38625,7 @@ anJ aeK amh amj -amK +ifk afH aqF arn @@ -42021,9 +42854,9 @@ aaa aaa aaa aaa -aed -agg -agg +aaa +aaa +aaa aaU aaU aaU diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 2e9c8e11d4..9c595e82e1 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1085,6 +1085,19 @@ /area/shuttle/medivac/engines name = "\improper Medivac Engines" +/area/shuttle/securiship + requires_power = 1 + icon_state = "shuttle2" + +/area/shuttle/securiship/general + name = "\improper Securiship" + +/area/shuttle/securiship/cockpit + name = "\improper Securiship Cockpit" + +/area/shuttle/securiship/engines + name = "\improper Securiship Engines" + //TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index b340efa929..be5f14b42f 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -260,3 +260,29 @@ name = "short jump console" shuttle_tag = "Medivac Shuttle" req_one_access = list(access_cmo, access_pilot) + +//////////////////////////////////////// +//////// Securiship ///////////// +//////////////////////////////////////// +/datum/shuttle/autodock/overmap/securiship + name = "Securiship Shuttle" + warmup_time = 0 + current_location = "tether_securiship_dock" + docking_controller_tag = "securiship_docker" + shuttle_area = list(/area/shuttle/securiship/cockpit, /area/shuttle/securiship/general, /area/shuttle/securiship/engines) + fuel_consumption = 1 + move_direction = NORTH + +// The 'ship' of the excursion shuttle +/obj/effect/overmap/visitable/ship/landable/securiship + name = "Securiship Shuttle" + desc = "A security transport ship." + vessel_mass = 3000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Securiship Shuttle" + fore_dir = EAST + +/obj/machinery/computer/shuttle_control/explore/securiship + name = "short jump console" + shuttle_tag = "Securiship Shuttle" + req_one_access = list(access_pilot, access_hos)