From 443c115538a970ceb1e8a64b7e90299cf66cce8c Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 10 Dec 2019 11:53:36 -0500 Subject: [PATCH 1/3] S. Cmd. Oversight Fixy Changelog Notes: - Fixes air supply/scrubbers oversights with the Space Command change. --- maps/tether/tether-05-station1.dmm | 296 ++++++++++++++++------------- 1 file changed, 169 insertions(+), 127 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 1e1f6a3c0fa..99e09671f4c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -10950,22 +10950,40 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "atU" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "Visitor Office"; - sortType = "Visitor Office" - }, -/obj/structure/cable/green{ +/obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/green{ +/obj/structure/cable{ d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "atV" = ( /obj/structure/cable/green{ d1 = 4; @@ -11236,14 +11254,33 @@ /turf/simulated/wall/r_wall, /area/maintenance/station/spacecommandmaint) "auE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/visitorhallway) "auF" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -11490,17 +11527,24 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "ave" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) +/area/tether/station/visitorhallway) "avf" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/airless, @@ -11976,18 +12020,28 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "avR" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/command, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction{ + name = "Visitor Office"; + sortType = "Visitor Office" }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor, -/area/bridge/secondary/hallway) +/area/maintenance/station/spacecommandmaint) "avS" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -12014,41 +12068,35 @@ /turf/simulated/wall, /area/tether/station/visitorhallway) "avV" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor, +/area/maintenance/station/spacecommandmaint) +"avW" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) -"avW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + icon_state = "intact-supply"; + dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) +/turf/simulated/floor, +/area/maintenance/station/spacecommandmaint) "avX" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -12352,30 +12400,25 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) "awr" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/command, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/visitorhallway) +/turf/simulated/floor, +/area/bridge/secondary/hallway) "aws" = ( /turf/simulated/wall, /area/tether/station/stairs_one) @@ -12404,9 +12447,23 @@ /turf/simulated/wall, /area/crew_quarters/sleep/spacedorm2) "awx" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/bridge/secondary/meeting_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/bridge/secondary/hallway) "awy" = ( /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -12472,8 +12529,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "awE" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -12482,11 +12537,22 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor, -/area/tether/station/visitorhallway) +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/bridge/secondary/hallway) "awF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -13840,15 +13906,12 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) "ayR" = ( -/obj/structure/dispenser{ - phorontanks = 0 - }, -/obj/machinery/camera/network/command{ - icon_state = "camera"; +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/bridge/secondary/teleporter) +/turf/simulated/floor/wood, +/area/bridge/secondary/meeting_room) "ayS" = ( /obj/structure/cable/green{ d1 = 4; @@ -14929,39 +14992,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aAz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/dispenser{ + phorontanks = 0 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/camera/network/command{ + icon_state = "camera"; + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/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/atrium) +/turf/simulated/floor/tiled/dark, +/area/bridge/secondary/teleporter) "aAA" = ( /obj/structure/cable{ d1 = 4; @@ -32919,7 +32961,7 @@ aux avA afI avT -awr +auE aww axg axM @@ -33061,7 +33103,7 @@ auC avC afI avU -awE +ave aww aww aww @@ -33203,9 +33245,9 @@ afI afI afI aAn -atU -auE -ave +avR +avV +avW ail aBL ail @@ -33347,7 +33389,7 @@ auq auu avk auD -avR +awr axs ahj ahj @@ -33476,7 +33518,7 @@ acC adm acy aCx -aAz +atU agl ahL ahL @@ -33489,12 +33531,12 @@ adj adj auQ avb -avV +awx awA ahj aqg aAs -ayR +aAz avr awW aAt @@ -33631,7 +33673,7 @@ aun auL avp avb -avW +awE axq awN axh @@ -34345,7 +34387,7 @@ avY axy ahN aht -awx +ayR awy aia aia From 24d6437c8ffecef3c86f1cf0bb72e7c389783ec9 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 10 Dec 2019 12:28:05 -0500 Subject: [PATCH 2/3] Command Blast Doors - Add blast doors for Space and Surface Command access points. --- maps/tether/tether-02-surface2.dmm | 50 +++++++++++++++++---------- maps/tether/tether-03-surface3.dmm | 54 +++++++++++++++++++++++++++--- maps/tether/tether-05-station1.dmm | 32 ++++++++++++++++++ maps/tether/tether-06-station2.dmm | 16 +++++++++ 4 files changed, 130 insertions(+), 22 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index b032916c16f..a475b3d2db6 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -7915,6 +7915,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/bridge_hallway) "apR" = ( @@ -25173,6 +25181,30 @@ /obj/structure/bed/padded, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/solitary) +"aTK" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/command{ + req_access = list(19) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor, +/area/bridge_hallway) "aTL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28490,22 +28522,6 @@ can_open = 0 }, /area/maintenance/lower/bar) -"aZb" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/command{ - req_access = list(19) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/bridge_hallway) "aZc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41938,7 +41954,7 @@ aXo aXY aqy aob -aZb +aTK asc avj aWY diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index a23f119e331..cb2ffcc94ac 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -13488,6 +13488,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/bridge_hallway) "awJ" = ( @@ -27205,6 +27213,42 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "aTt" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_command{ + dir = 1; + name = "Bridge"; + req_access = list(19) + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge) +"aTu" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_command{ + name = "Bridge"; + req_access = list(19) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge) +"aTv" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/carry, @@ -42852,7 +42896,7 @@ alj alj alj asT -aYj +aTt asT alX alX @@ -45124,7 +45168,7 @@ ayx alo alo asT -aYr +aTu asT alZ alZ @@ -45301,7 +45345,7 @@ aNk aNl aNJ aNP -aTt +aTv aKU abg aOk @@ -45443,7 +45487,7 @@ aNl aNl aNK aNP -aTt +aTv aKU abg aOk @@ -45585,7 +45629,7 @@ aNm aNl aNK aNP -aTt +aTv aKU abg aOk diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 99e09671f4c..3ff7af359ff 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2752,6 +2752,14 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 8; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled, /area/bridge/secondary) "afd" = ( @@ -4927,6 +4935,14 @@ name = "Secondary Command Office" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 8; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled, /area/bridge/secondary) "aix" = ( @@ -12417,6 +12433,14 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/bridge/secondary/hallway) "aws" = ( @@ -12940,6 +12964,14 @@ "axm" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/command, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 8; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/bridge/secondary/teleporter) "axn" = ( diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 37b32b119c0..e6beaf5f489 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -15156,6 +15156,14 @@ /obj/machinery/door/airlock/maintenance/command{ req_access = list(19) }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 8; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/maintenance/station/micro) "wT" = ( @@ -15167,6 +15175,14 @@ req_access = list(19) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "secondary_bridge_blast"; + name = "Secondary Command Office Blast Doors"; + opacity = 0 + }, /turf/simulated/floor, /area/maintenance/station/micro) "wU" = ( From 1a14754e239e23f8492073275543462f5d73843b Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 10 Dec 2019 19:02:07 -0500 Subject: [PATCH 3/3] Camera Addition - Camera for blind spot for AI to access the heavy scrubber control console. --- maps/tether/tether-01-surface1.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index bdafafea0e0..45c8371339c 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -1901,6 +1901,7 @@ dir = 4; scrub_id = "atrium" }, +/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "ado" = (