From 7fc93097b22d3a8931824b072fc0068dd3358f0c Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 11 Jun 2021 18:01:45 +1000 Subject: [PATCH 1/3] Fixes some telecomms things --- maps/tether/tether-05-station1.dmm | 1043 +++++++++++++++------------- 1 file changed, 550 insertions(+), 493 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 3a943c67b1b..60478d10653 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1281,6 +1281,17 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/teleporter/departing) +"acu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/porta_turret/stationary, +/turf/simulated/floor/tiled/dark{ + nitrogen = 100; + oxygen = 0; + temperature = 80 + }, +/area/tcommsat/chamber) "acv" = ( /obj/structure/table/rack{ dir = 8; @@ -1333,6 +1344,17 @@ "acz" = ( /turf/simulated/wall/r_wall, /area/engineering/hallway) +"acA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, +/obj/machinery/porta_turret/stationary, +/turf/simulated/floor/tiled/dark{ + nitrogen = 100; + oxygen = 0; + temperature = 80 + }, +/area/tcommsat/chamber) "acB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1345,6 +1367,87 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"acC" = ( +/obj/item/device/multitool, +/obj/structure/table/standard, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 25 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acE" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/turretid/lethal{ + ailock = 1; + check_synth = 0; + control_area = /area/tcommsat/chamber; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms lethal turret control"; + pixel_y = 29; + req_access = list(61); + req_one_access = list(12) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acF" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/porta_turret{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acG" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/porta_turret{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) "acH" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1363,6 +1466,28 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"acI" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) "acJ" = ( /turf/simulated/floor, /area/engineering/engine_room) @@ -1434,9 +1559,72 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor, /area/maintenance/substation/engineering) +"acP" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acQ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acR" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) "acS" = ( /turf/simulated/wall/r_wall, /area/engineering/workshop) +"acT" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/r_wall, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "acU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1452,6 +1640,33 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"acV" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/highsecurity{ + name = "Telecomms Access"; + req_one_access = list(10,12,16,17,61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"acW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/r_wall, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "acX" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -1465,12 +1680,87 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"acY" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/camera/network/telecom, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"acZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "ada" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"adb" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/turretid/stun{ + ailock = 1; + check_synth = 0; + control_area = /area/tcomsat; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms Foyer turret control"; + pixel_y = 29; + req_access = list(); + req_one_access = list(10,12,16,17,61) + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adc" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -1487,6 +1777,19 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) +"add" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "ade" = ( /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, @@ -1510,6 +1813,21 @@ }, /turf/simulated/floor, /area/engineering/engine_monitoring) +"adg" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1561,6 +1879,46 @@ }, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +"adk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adl" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adm" = ( +/obj/machinery/atmospherics/binary/passive_gate/on{ + dir = 2 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adn" = ( /obj/structure/table/rack{ dir = 8; @@ -1625,6 +1983,22 @@ }, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +"adr" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "ads" = ( /obj/structure/cable{ d1 = 4; @@ -1704,6 +2078,50 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"adx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/closet/crate/solar, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"ady" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adz" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1763,6 +2181,19 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) +"adE" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adF" = ( /obj/machinery/power/terminal{ dir = 1 @@ -1808,6 +2239,19 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) +"adJ" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "adK" = ( /obj/effect/landmark{ name = "morphspawn" @@ -1834,6 +2278,42 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"adM" = ( +/obj/structure/disposalpipe/segment, +/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 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"adN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "adQ" = ( /obj/machinery/computer/power_monitor{ dir = 4; @@ -9412,19 +9892,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"ayI" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "ayK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -9614,22 +10081,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) -"azu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "azv" = ( /obj/machinery/door/airlock/multi_tile/metal/mait, /obj/machinery/door/firedoor/glass, @@ -10097,19 +10548,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"aBk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "aBl" = ( /obj/structure/window/reinforced{ dir = 4 @@ -11089,15 +11527,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aEF" = ( -/obj/machinery/camera/network/telecom, -/obj/machinery/atmospherics/binary/passive_gate/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "aEI" = ( /obj/machinery/power/solar, /obj/structure/cable/yellow{ @@ -14879,26 +15308,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"bPV" = ( -/obj/item/device/multitool, -/obj/structure/table/standard, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/turretid/lethal{ - ailock = 1; - check_synth = 1; - control_area = /area/tcommsat/chamber; - desc = "A firewall prevents AIs from interacting with this device."; - name = "Telecoms lethal turret control"; - pixel_x = 29; - req_access = list(61); - req_one_access = list(12) - }, -/turf/simulated/floor/tiled, -/area/tcommsat/computer) "bPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -15008,30 +15417,10 @@ temperature = 80 }, /area/tcommsat/chamber) -"bTu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark{ - nitrogen = 100; - oxygen = 0; - temperature = 80 - }, -/area/tcommsat/chamber) "bTZ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) -"bUj" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Messaging Server"; - req_one_access = list(12,16,17,61) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "bUz" = ( /obj/machinery/camera/network/telecom{ dir = 1 @@ -15588,14 +15977,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"cjr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "cjQ" = ( /obj/effect/floor_decal/industrial/loading{ dir = 8 @@ -15759,19 +16140,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/storage/tech) -"cuN" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "cvx" = ( /obj/machinery/shipsensors{ dir = 1 @@ -16696,32 +17064,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) -"dkR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "dkV" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -17858,18 +18200,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"exs" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "eyT" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18607,20 +18937,6 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) -"fqw" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/turf/simulated/floor/tiled/dark, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "fqP" = ( /obj/machinery/power/apc{ dir = 8; @@ -19255,26 +19571,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"gdZ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/device/radio/beacon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "ged" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -19602,20 +19898,6 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"gvM" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "gys" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -20211,23 +20493,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"heQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "hfo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -20471,28 +20736,6 @@ /area/tcomfoyer{ name = "\improper Telecomms Storage" }) -"hqq" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "hqA" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/industrial/outline/blue, @@ -21909,16 +22152,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"iAx" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/wall/r_wall, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "iAG" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -21991,20 +22224,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"iEU" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "iGo" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -22478,23 +22697,6 @@ /obj/structure/sign/department/eng, /turf/simulated/wall/r_wall, /area/hallway/station/docks) -"jmn" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/highsecurity{ - name = "Telecomms Access"; - req_one_access = list(10,12,16,17,61) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "jms" = ( /obj/structure/table/rack, /obj/item/clothing/suit/space/void/mining, @@ -22576,32 +22778,6 @@ }, /turf/space, /area/space) -"jsK" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/turretid/lethal{ - ailock = 1; - check_synth = 1; - control_area = /area/tcommsat/chamber; - desc = "A firewall prevents AIs from interacting with this device."; - name = "Telecoms lethal turret control"; - pixel_y = 29; - req_access = list(61); - req_one_access = list(12) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "jsP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -23281,15 +23457,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"kcM" = ( -/obj/structure/closet/crate/solar, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "kcV" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/blue, @@ -25862,32 +26029,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"moi" = ( -/obj/machinery/turretid/stun{ - ailock = 1; - check_synth = 1; - control_area = /area/tcomsat; - desc = "A firewall prevents AIs from interacting with this device."; - name = "Telecoms Foyer turret control"; - pixel_y = 29; - req_access = list(); - req_one_access = list(10,12,16,17,61) - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "mou" = ( /obj/machinery/door/airlock/glass_external, /obj/structure/cable/green{ @@ -26722,18 +26863,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) -"nab" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/tank/air/full{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "nac" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -27150,17 +27279,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"nwy" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "nwK" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27635,23 +27753,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"nWq" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "nXm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8; @@ -30257,26 +30358,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"rjV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/id_restorer{ - dir = 8; - pixel_x = 32 - }, -/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 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "rlr" = ( /obj/structure/table/standard, /obj/item/weapon/tape_roll, @@ -34128,20 +34209,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"vXw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/porta_turret{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "vYj" = ( /obj/structure/table/rack{ dir = 8; @@ -35117,16 +35184,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"xlb" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) "xmh" = ( /obj/machinery/gateway{ dir = 9 @@ -46244,9 +46301,9 @@ tRn vYJ vYJ dPx -rjV +adM kts -vYJ +adN vYJ aba abm @@ -50468,7 +50525,7 @@ rLI amJ avZ thI -rLO +acu xTB bpd xTB @@ -50624,9 +50681,9 @@ izZ otm dkG cEE -kcM -exs -nab +adl +adz +adJ kff kff kff @@ -50757,17 +50814,17 @@ kyd bLZ gtY xEG -vXw -cjr +acD +acF vxd lsa cso -cuN -ayI -dkR -kff -aEF -gvM +acI +acT +acY +add +adm +adE uWa gbt fFq @@ -50904,11 +50961,11 @@ xzC hkR lGY nJx -iEU -azu -nWq -jmn -gdZ +acP +acV +acZ +adg +ady mpB gWD nSK @@ -51041,16 +51098,16 @@ xSF xjt awC xEG -jsK -heQ +acE +acG vxd qOh yaH -xlb -aBk -hqq -iAx -moi +acQ +acW +adb +adk +adr sRH jSj kff @@ -51188,11 +51245,11 @@ xEG xEG woq jxP -fqw +acR xEG dls dTU -nwy +adx dyt hAw kff @@ -51218,7 +51275,7 @@ aaa aaa aaa aaa -aaa +ahW fLT fLT fLT @@ -51334,7 +51391,7 @@ xEG xEG xdJ dTU -bUj +kff kff kff kff @@ -51360,7 +51417,7 @@ aaa aaa aaa aaa -aaa +ahW fvg aaa aaa @@ -51482,6 +51539,7 @@ dTU gfX asM hOw +ahW aaa aaa aaa @@ -51501,8 +51559,7 @@ aaa aaa aaa aaa -aaa -aaa +ahW aaa aaa aaa @@ -51604,9 +51661,9 @@ xTB aie axf uyX -bTu +acA xSF -bPV +acC pyE ged ayg @@ -51623,31 +51680,31 @@ gDA dTU gfX fpk -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ahW +ahW +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahW +ahW +ahW iZC iTF jFv @@ -51766,7 +51823,7 @@ dTU gfX fpk aaa -aaa +ahW aaa aaa aaa @@ -51908,7 +51965,7 @@ gfX gfX rhn aaa -aaa +ahW aaa aaa aaa @@ -52050,7 +52107,7 @@ gPx gPx hOw aaa -aaa +ahW aaa aaa aaa @@ -52192,7 +52249,7 @@ aaa aaa aaa aaa -aaa +ahW aaa aaa aaa @@ -52329,12 +52386,12 @@ aaa aaa aaa ahW -aaa -aaa -aaa -aaa -aaa -aaa +ahV +ahV +ahV +ahV +ahV +ahV aaa aaa aaa From 9c155dda19e79c7383bee4fcbd21c1b5e5397fd2 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 19 Jun 2021 04:48:39 +1000 Subject: [PATCH 2/3] Actually brings over the changes --- maps/tether/tether-05-station1.dmm | 341 +++++++++++++---------------- 1 file changed, 157 insertions(+), 184 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index a1dd817c184..e6514e0fec8 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1368,6 +1368,18 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "acC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acD" = ( /obj/item/device/multitool, /obj/structure/table/standard, /obj/structure/cable/green{ @@ -1377,7 +1389,17 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"acD" = ( +"acE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -1391,7 +1413,7 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"acE" = ( +"acG" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -1414,37 +1436,6 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"acF" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/porta_turret{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"acG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/porta_turret{ - dir = 6 - }, -/turf/simulated/floor/tiled, /area/tcomsat{ name = "\improper Telecomms Lobby" }) @@ -1467,22 +1458,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "acI" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/porta_turret{ + dir = 6 }, /turf/simulated/floor/tiled, /area/tcomsat{ @@ -1560,6 +1540,48 @@ /turf/simulated/floor, /area/maintenance/substation/engineering) "acP" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/porta_turret{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acQ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acR" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1578,7 +1600,10 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"acQ" = ( +"acS" = ( +/turf/simulated/wall/r_wall, +/area/engineering/workshop) +"acT" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -1594,37 +1619,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"acR" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/dark, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"acS" = ( -/turf/simulated/wall/r_wall, -/area/engineering/workshop) -"acT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/wall/r_wall, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "acU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1641,24 +1635,25 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "acV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 }, -/obj/machinery/door/airlock/highsecurity{ - name = "Telecomms Access"; - req_one_access = list(10,12,16,17,61) +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tcomsat{ + name = "\improper Telecomms Lobby" }) "acW" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" @@ -1984,17 +1979,19 @@ /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "adr" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" @@ -2079,6 +2076,22 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "adx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"ady" = ( /obj/machinery/light/small{ dir = 1 }, @@ -2087,24 +2100,6 @@ }, /obj/structure/closet/crate/solar, /turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) -"ady" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/device/radio/beacon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) @@ -2292,22 +2287,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) -"adN" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /obj/machinery/computer/guestpass{ dir = 8; pixel_x = 25 @@ -15146,17 +15125,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"bLM" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tcommsat/computer) "bLO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -15568,15 +15536,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"bYk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tcommsat/computer) "bYr" = ( /turf/simulated/wall, /area/maintenance/station/cargo) @@ -19906,19 +19865,6 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"gvM" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) "gys" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -22174,6 +22120,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"iAx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/r_wall, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "iAG" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -22719,6 +22675,23 @@ /obj/structure/sign/department/eng, /turf/simulated/wall/r_wall, /area/hallway/station/docks) +"jmn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/highsecurity{ + name = "Telecomms Access"; + req_one_access = list(10,12,16,17,61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "jms" = ( /obj/structure/table/rack, /obj/item/clothing/suit/space/void/mining, @@ -46295,7 +46268,7 @@ vYJ dPx adM kts -adN +vYJ vYJ aba abm @@ -50661,7 +50634,7 @@ apU thI rLO xSF -bLM +acC dJJ xEG awQ @@ -50806,13 +50779,13 @@ kyd bLZ gtY xEG -acD acF +acI vxd lsa cso -acI -acT +acQ +acW acY add adm @@ -50953,11 +50926,11 @@ xzC hkR lGY nJx -acP -acV +acR +jmn acZ adg -ady +adr mpB gWD nSK @@ -51090,16 +51063,16 @@ xSF xjt awC xEG -acE acG +acP vxd qOh yaH -acQ -acW +acT +iAx adb adk -adr +adx sRH jSj kff @@ -51237,11 +51210,11 @@ xEG xEG woq jxP -acR +acV xEG dls dTU -adx +ady dyt hAw kff @@ -51372,7 +51345,7 @@ thI rLO xSF xjt -bYk +acE fyF iYB hic @@ -51655,7 +51628,7 @@ axf uyX acA xSF -acC +acD pyE ged ayg @@ -51694,9 +51667,9 @@ ahV ahV ahV ahV -ahW -ahW -ahW +aaa +aaa +aaa iZC iTF jFv From d1fdc8acf6791d6ecf45ba04e9266afcd062eaa8 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 19 Jun 2021 13:51:29 +1000 Subject: [PATCH 3/3] Fixes access on turrets Maint access has nothing to do with it, and the rest is just ?! why is it there!? --- maps/tether/tether-05-station1.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index e6514e0fec8..af265d452bb 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1427,7 +1427,7 @@ name = "Telecoms lethal turret control"; pixel_y = 29; req_access = list(61); - req_one_access = list(12) + req_one_access = list() }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -1749,8 +1749,8 @@ desc = "A firewall prevents AIs from interacting with this device."; name = "Telecoms Foyer turret control"; pixel_y = 29; - req_access = list(); - req_one_access = list(10,12,16,17,61) + req_access = list(61); + req_one_access = list() }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{