From 9ca52e2959d5af8e1780e9fb8547814addac0b7f Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Sat, 23 Nov 2019 04:18:44 -0500
Subject: [PATCH 01/11] Smol Cargonian Fixy

- Switches to two way.... Switches.... For both Mining Warehouse and Cargo Warehouse.

- - Adjusts disposal pipes for Mining Warehouse route to look a bit better.

- Slapping in a Robotics Sorting Junction fix.
---
 maps/tether/tether-01-surface1.dmm | 89 ++++++++++++++----------------
 maps/tether/tether-03-surface3.dmm | 52 ++++++++---------
 maps/tether/tether-07-station3.dmm |  9 ++-
 3 files changed, 72 insertions(+), 78 deletions(-)

diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 344cb2d464a..d71656ce63d 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -4785,9 +4785,6 @@
 /area/tether/surfacebase/mining_main/lobby)
 "ail" = (
 /obj/effect/floor_decal/rust,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /obj/structure/plasticflaps,
 /obj/machinery/disposal/deliveryChute{
 	dir = 4
@@ -4796,6 +4793,7 @@
 	dir = 4;
 	id = "gloriouscargopipeline"
 	},
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/mining_main/ore)
 "aim" = (
@@ -6864,9 +6862,6 @@
 /area/maintenance/lower/mining_eva)
 "alY" = (
 /obj/effect/floor_decal/rust,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/conveyor{
 	dir = 4;
 	id = "gloriouscargopipeline"
@@ -7067,15 +7062,8 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/tether/surfacebase/mining_main/ore)
 "ams" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "gloriouscargopipeline"
-	},
-/turf/simulated/floor/tiled/steel_dirty,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/wall,
 /area/tether/surfacebase/mining_main/ore)
 "amt" = (
 /obj/structure/cable/green{
@@ -7691,7 +7679,6 @@
 	name = "Mining Maintenance Access";
 	req_one_access = list(48)
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/mining_main/ore)
 "anp" = (
@@ -21078,32 +21065,13 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
 "aIA" = (
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 1
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/brown/bordercorner2{
-	dir = 1
-	},
-/obj/machinery/light_switch{
-	dir = 2;
-	name = "light switch ";
-	pixel_x = 10;
-	pixel_y = 32
-	},
-/obj/machinery/conveyor_switch/oneway{
-	id = "gloriouscargopipeline";
-	layer = 3.3;
-	name = "outbound conveyor";
-	pixel_y = 14
-	},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/mining_main/surfacecargo)
+/turf/simulated/floor/plating,
+/area/maintenance/lower/mining_eva)
 "aIB" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -31889,6 +31857,33 @@
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_laundry)
+"bcO" = (
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/brown/bordercorner2{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	dir = 2;
+	name = "light switch ";
+	pixel_x = 10;
+	pixel_y = 32
+	},
+/obj/machinery/conveyor_switch{
+	id = "gloriouscargopipeline";
+	name = "Mining Supply conveyor switch";
+	pixel_x = 0;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/mining_main/surfacecargo)
 "cGJ" = (
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining_eva)
@@ -43331,8 +43326,8 @@ aeE
 age
 afD
 ail
-aer
-bbE
+ams
+aIA
 air
 bcg
 agM
@@ -43474,7 +43469,7 @@ aff
 alJ
 alY
 aer
-bbE
+bcf
 bcf
 bcg
 agM
@@ -43614,9 +43609,9 @@ aer
 afe
 agf
 agf
-ams
+amO
 ano
-bce
+bcf
 bcf
 cGJ
 agM
@@ -44468,7 +44463,7 @@ afi
 amv
 agj
 amw
-aIA
+bcO
 bbv
 bbC
 amc
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index e543c61fc28..edca2177fd7 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -26574,10 +26574,23 @@
 /turf/simulated/floor/tiled/steel,
 /area/rnd/outpost/xenobiology/outpost_first_aid)
 "aSC" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/structure/disposalpipe/sortjunction{
+	dir = 4;
+	icon_state = "pipe-j1s";
+	name = "Robotics";
+	sortType = "Robotics"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/assembly/robotics)
 "aSD" = (
 /obj/structure/sign/redcross,
 /turf/simulated/wall,
@@ -26602,6 +26615,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge_hallway)
+"aSF" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aSG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -30885,24 +30903,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge)
-"baB" = (
-/obj/structure/disposalpipe/sortjunction{
-	dir = 4;
-	icon_state = "pipe-j1s";
-	name = "Command Meeting Room";
-	sortType = "Command Meeting Room"
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/assembly/robotics)
 "baE" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -40434,7 +40434,7 @@ aCA
 aGT
 aHK
 aCz
-baB
+aSC
 aJR
 aKK
 aLr
@@ -45273,7 +45273,7 @@ aNk
 aNl
 aNJ
 aNP
-aSC
+aSF
 aKU
 abg
 aOk
@@ -45415,7 +45415,7 @@ aNl
 aNl
 aNK
 aNP
-aSC
+aSF
 aKU
 abg
 aOk
@@ -45557,7 +45557,7 @@ aNm
 aNl
 aNK
 aNP
-aSC
+aSF
 aKU
 abg
 aOk
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 10c16b0e973..9bbceee03aa 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -25059,12 +25059,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/conveyor_switch/oneway{
+/obj/machinery/conveyor_switch{
 	id = "gloriouscargopipeline";
-	layer = 3.3;
-	name = "Surface delivery conveyor";
-	pixel_x = 14;
-	pixel_y = -3
+	name = "Mining Supply conveyor switch";
+	pixel_x = 0;
+	pixel_y = 0
 	},
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/warehouse)

From 77f4c58c6fe093fc8ac8811788392af12791a32c Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Sat, 23 Nov 2019 14:41:57 -0500
Subject: [PATCH 02/11] Air Alarm Placement

Fixes placement of an air alarm being mapped in to the same tile as an emergency shutter.
---
 maps/tether/tether-03-surface3.dmm | 36 +++++++++---------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index edca2177fd7..5ded9ca7a7c 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -21551,12 +21551,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 1
 	},
+/obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
-	pixel_y = -25
-	},
-/obj/machinery/door/firedoor/glass/hidden/steel{
-	dir = 1
+	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
@@ -21593,17 +21591,10 @@
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
 "aIE" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 8
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 1
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/hallway/lower/third_south)
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aIF" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/secure_closet/security,
@@ -26615,11 +26606,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge_hallway)
-"aSF" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
 "aSG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -43983,7 +43969,7 @@ aFX
 aAB
 aHl
 aHY
-aIB
+aIG
 ats
 aKf
 aKf
@@ -44693,7 +44679,7 @@ aGb
 awR
 aHo
 aIa
-aIE
+aIB
 ats
 aKk
 aKY
@@ -45273,7 +45259,7 @@ aNk
 aNl
 aNJ
 aNP
-aSF
+aIE
 aKU
 abg
 aOk
@@ -45415,7 +45401,7 @@ aNl
 aNl
 aNK
 aNP
-aSF
+aIE
 aKU
 abg
 aOk
@@ -45557,7 +45543,7 @@ aNm
 aNl
 aNK
 aNP
-aSF
+aIE
 aKU
 abg
 aOk

From ee051c85ca5961fbd6a53d3c35882f177fc548a5 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:08:36 -0500
Subject: [PATCH 03/11] Lightbulb to Library

---
 maps/tether/tether-03-surface3.dmm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 5ded9ca7a7c..ef92571578e 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -21591,10 +21591,11 @@
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
 "aIE" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "aIF" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/secure_closet/security,
@@ -26606,6 +26607,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge_hallway)
+"aSF" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aSG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -42397,7 +42403,7 @@ axg
 azP
 axg
 axg
-azT
+aIE
 aEP
 aEG
 azT
@@ -45259,7 +45265,7 @@ aNk
 aNl
 aNJ
 aNP
-aIE
+aSF
 aKU
 abg
 aOk
@@ -45401,7 +45407,7 @@ aNl
 aNl
 aNK
 aNP
-aIE
+aSF
 aKU
 abg
 aOk
@@ -45543,7 +45549,7 @@ aNm
 aNl
 aNK
 aNP
-aIE
+aSF
 aKU
 abg
 aOk

From c7e333720b09f705985ed7f4f7f5127b4cbec1e5 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 25 Nov 2019 16:03:25 -0500
Subject: [PATCH 04/11] More Stuff

- Cameras for AI Core Maint.

- Requested additions from another mapper to avoid conflicts.

- - Mech Recharger addition to Surface Medical.

- - Cryobags and the sleevemate moved down to a different table to expose charger.

- - Another charger added a bit further up in the room.
---
 maps/tether/tether-03-surface3.dmm | 69 +++++++++++----------
 maps/tether/tether-07-station3.dmm | 98 ++++++++++++++++++------------
 2 files changed, 94 insertions(+), 73 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index ef92571578e..fd8ccf32b0a 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -684,14 +684,18 @@
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "abw" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/effect/floor_decal/borderfloorwhite/corner2{
-	dir = 9
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner/paleblue/bordercorner2{
-	dir = 9
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
 	},
+/obj/machinery/camera/network/medbay{
+	icon_state = "camera";
+	dir = 4
+	},
+/obj/structure/table/glass,
+/obj/machinery/recharger,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "abx" = (
@@ -2217,8 +2221,6 @@
 /area/vacant/vacant_site2)
 "aea" = (
 /obj/structure/table/glass,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
 /obj/machinery/light{
 	icon_state = "tube1";
 	dir = 8
@@ -2229,7 +2231,6 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 8
 	},
-/obj/item/device/sleevemate,
 /obj/item/device/radio/intercom/department/medbay{
 	dir = 8;
 	pixel_x = -24
@@ -2247,16 +2248,29 @@
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/security/armory)
 "aec" = (
+/obj/structure/table/glass,
+/obj/item/weapon/storage/box/syringes,
 /obj/effect/floor_decal/borderfloorwhite{
-	dir = 8
+	dir = 10
 	},
 /obj/effect/floor_decal/corner/paleblue/border{
-	dir = 8
+	dir = 10
+	},
+/obj/machinery/requests_console{
+	announcementConsole = 1;
+	department = "Medical Department";
+	departmentType = 3;
+	name = "Medical RC";
+	pixel_x = -30;
+	pixel_y = 0
 	},
 /obj/machinery/camera/network/medbay{
 	icon_state = "camera";
-	dir = 4
+	dir = 10
 	},
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/device/sleevemate,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "aed" = (
@@ -15265,26 +15279,15 @@
 /turf/simulated/wall,
 /area/hydroponics)
 "azu" = (
-/obj/structure/table/glass,
-/obj/item/weapon/storage/box/syringes,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 10
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 9
 	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 10
-	},
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Medical Department";
-	departmentType = 3;
-	name = "Medical RC";
-	pixel_x = -30;
-	pixel_y = 0
-	},
-/obj/machinery/camera/network/medbay{
-	icon_state = "camera";
-	dir = 10
+/obj/effect/floor_decal/corner/paleblue/bordercorner2{
+	dir = 9
 	},
+/obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "azv" = (
@@ -43641,7 +43644,7 @@ adM
 aea
 afb
 aga
-azu
+aec
 aag
 afF
 aja
@@ -43918,7 +43921,7 @@ aaD
 aag
 aao
 aeH
-aec
+abw
 aaH
 aaR
 aba
@@ -44067,7 +44070,7 @@ aaI
 aaS
 acc
 acO
-abw
+azu
 agn
 aiB
 aUV
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 9bbceee03aa..0da48bde821 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -8550,10 +8550,19 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/upper)
 "nh" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/tether)
+/obj/structure/catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/camera/network/command{
+	icon_state = "camera";
+	dir = 10
+	},
+/turf/simulated/floor,
+/area/maintenance/station/ai)
 "ni" = (
 /obj/structure/bookcase,
 /obj/item/weapon/book/manual/security_space_law,
@@ -26994,13 +27003,10 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "Qh" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_l"
-	},
-/turf/space,
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
 /turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
+/area/shuttle/excursion/tether)
 "Qi" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -27051,16 +27057,23 @@
 /turf/simulated/open,
 /area/security/brig)
 "Qm" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/structure/catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
+/obj/machinery/camera/network/command{
+	icon_state = "camera";
+	dir = 4
+	},
+/turf/simulated/floor,
+/area/maintenance/station/ai)
 "Qn" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 8;
-	icon_state = "propulsion_r"
+	icon_state = "propulsion_l"
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -27078,6 +27091,21 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"Qp" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8
+	},
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
+"Qq" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_r"
+	},
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
 "Qr" = (
 /obj/machinery/shower{
 	pixel_y = 10
@@ -27622,16 +27650,6 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor,
 /area/maintenance/station/ai)
-"RL" = (
-/obj/structure/catwalk,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/turf/simulated/floor,
-/area/maintenance/station/ai)
 "RM" = (
 /obj/structure/catwalk,
 /obj/structure/cable{
@@ -39323,11 +39341,11 @@ MK
 Iy
 ab
 NL
-Qh
-Qm
-Qm
-Qm
 Qn
+Qp
+Qp
+Qp
+Qq
 NL
 vt
 vt
@@ -40550,7 +40568,7 @@ Zy
 WG
 dj
 XA
-nh
+Qh
 ms
 Oz
 be
@@ -40692,7 +40710,7 @@ UJ
 Xb
 dj
 XN
-nh
+Qh
 ms
 Xq
 be
@@ -40834,7 +40852,7 @@ iW
 WS
 dj
 XN
-nh
+Qh
 ms
 Xq
 be
@@ -41117,7 +41135,7 @@ jZ
 WR
 Xo
 XN
-nh
+Qh
 cK
 ms
 Xq
@@ -41685,7 +41703,7 @@ ea
 kx
 dj
 XN
-nh
+Qh
 cK
 ms
 mq
@@ -41970,7 +41988,7 @@ kQ
 TG
 dj
 XN
-nh
+Qh
 ms
 mq
 be
@@ -42112,7 +42130,7 @@ kR
 Vd
 dj
 XN
-nh
+Qh
 ms
 QL
 be
@@ -42254,7 +42272,7 @@ ZE
 ZB
 dj
 XB
-nh
+Qh
 ms
 Sq
 be
@@ -42966,7 +42984,7 @@ Pk
 RA
 RA
 RG
-RL
+Qm
 Ry
 RR
 Ss
@@ -43099,7 +43117,7 @@ eI
 fp
 mT
 dx
-Rx
+nh
 dV
 fy
 fy

From 77c7719bd35a2293c14f5c403f3140568a739452 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Wed, 27 Nov 2019 09:38:22 -0500
Subject: [PATCH 05/11] Library Tweaks

- Library tweaks

- - Book scanner moved to next to the computer.

- - Film rolls moved underneath camera.

- - Public Comp library and table added in a corner.
---
 maps/tether/tether-03-surface3.dmm | 79 +++++++++++++++---------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index fd8ccf32b0a..70c8666b7e2 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -14635,8 +14635,7 @@
 /area/crew_quarters/heads/hop)
 "ayy" = (
 /obj/structure/table/woodentable,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
+/obj/machinery/libraryscanner,
 /turf/simulated/floor/carpet,
 /area/library)
 "ayz" = (
@@ -15644,11 +15643,11 @@
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_breakroom)
 "azV" = (
-/obj/machinery/libraryscanner,
-/obj/machinery/camera/network/civilian{
-	dir = 9
-	},
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/taperecorder,
+/turf/simulated/floor/carpet,
 /area/library)
 "azW" = (
 /obj/structure/cable/green{
@@ -16775,9 +16774,14 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aBq" = (
-/obj/structure/table/woodentable,
-/obj/item/device/taperecorder,
-/turf/simulated/floor/carpet,
+/obj/item/device/radio/intercom{
+	pixel_x = 0;
+	pixel_y = -28
+	},
+/obj/structure/bed/chair/office/light{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/library)
 "aBr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -26611,10 +26615,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge_hallway)
 "aSF" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 26
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 2;
+	pixel_y = -28
+	},
+/obj/machinery/librarypubliccomp,
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/library)
 "aSG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -26634,6 +26647,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/patient_c)
+"aSH" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aSI" = (
 /turf/simulated/wall,
 /area/rnd/outpost/xenobiology/outpost_storage)
@@ -29121,13 +29139,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
-"aXw" = (
-/obj/item/device/radio/intercom{
-	pixel_x = 0;
-	pixel_y = -28
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "aXx" = (
 /obj/structure/closet/hydrant{
 	pixel_x = 32
@@ -29186,18 +29197,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/library)
-"aXE" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 26
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 2;
-	pixel_y = -28
-	},
-/turf/simulated/floor/wood,
-/area/library)
 "aXF" = (
 /obj/machinery/power/apc{
 	dir = 2;
@@ -42689,7 +42688,7 @@ axk
 ayy
 azR
 aAA
-aBq
+azV
 azT
 aEI
 aEI
@@ -43113,7 +43112,7 @@ ajM
 aoI
 axk
 azh
-azV
+aMk
 azT
 aBt
 aEu
@@ -43262,7 +43261,7 @@ aEz
 aEO
 aFe
 aFs
-aXw
+aBq
 axg
 axg
 axg
@@ -43404,7 +43403,7 @@ aEC
 aXC
 aEC
 aCF
-aXE
+aSF
 axg
 atH
 aGy
@@ -45268,7 +45267,7 @@ aNk
 aNl
 aNJ
 aNP
-aSF
+aSH
 aKU
 abg
 aOk
@@ -45410,7 +45409,7 @@ aNl
 aNl
 aNK
 aNP
-aSF
+aSH
 aKU
 abg
 aOk
@@ -45552,7 +45551,7 @@ aNm
 aNl
 aNK
 aNP
-aSF
+aSH
 aKU
 abg
 aOk

From de6c6ed72ed991423e1e74c62fec547a145a2d29 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Fri, 29 Nov 2019 10:27:02 -0500
Subject: [PATCH 06/11] More Fixes/Tweaks

---
 maps/tether/tether-01-surface1.dmm |  24 ++-
 maps/tether/tether-02-surface2.dmm | 259 ++++++++++++++++-------------
 maps/tether/tether-07-station3.dmm |  46 ++---
 3 files changed, 172 insertions(+), 157 deletions(-)

diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index d71656ce63d..88bb9ed98a4 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -13780,11 +13780,6 @@
 /area/tether/surfacebase/surface_one_hall)
 "axl" = (
 /obj/effect/floor_decal/borderfloor,
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -28
-	},
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -13796,6 +13791,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 8
 	},
+/obj/machinery/power/apc/high{
+	pixel_y = -28
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
 "axm" = (
@@ -19813,11 +19811,6 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 4
 	},
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 28
-	},
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
@@ -19827,6 +19820,11 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 10
 	},
+/obj/machinery/power/apc/high{
+	dir = 4;
+	pixel_x = 28;
+	pixel_y = 0
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "aGr" = (
@@ -19928,12 +19926,10 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aGB" = (
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
+/obj/structure/cable/green,
+/obj/machinery/power/apc/high{
 	pixel_y = -28
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aGC" = (
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 9b48d2b0324..dae11f24870 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -6591,12 +6591,8 @@
 /turf/simulated/floor/water/deep/indoors,
 /area/tether/surfacebase/fish_farm)
 "anp" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/toy/plushie/farwa,
-/turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/turf/simulated/wall,
+/area/rnd/rdoffice)
 "anq" = (
 /obj/effect/floor_decal/industrial/danger/corner{
 	dir = 8
@@ -6711,13 +6707,15 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/asmaint2)
 "anD" = (
-/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
 /turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/area/rnd/rdoffice)
 "anE" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/toy/plushie/farwa,
 /turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/area/rnd/rdoffice)
 "anF" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -6798,21 +6796,13 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/asmaint2)
 "anN" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
+/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
 /turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/area/rnd/rdoffice)
 "anO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	icon_state = "intact-scrubbers";
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/area/rnd/rdoffice)
 "anP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	icon_state = "intact-scrubbers";
@@ -8684,15 +8674,14 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -28
-	},
 /obj/structure/cable/green{
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/high{
+	dir = 8;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/server)
 "arv" = (
@@ -9694,8 +9683,15 @@
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/secondfloor)
 "asZ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/simulated/floor/reinforced,
-/area/maintenance/lower/rnd)
+/area/rnd/rdoffice)
 "ata" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/disposalpipe/segment,
@@ -17889,17 +17885,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/tcomms)
 "aHO" = (
-/obj/item/device/radio/intercom{
-	dir = 1;
-	name = "Station Intercom (General)";
-	pixel_y = 21
+/obj/machinery/camera/network/research/xenobio{
+	network = list("Xenobiology")
 	},
-/obj/machinery/alarm{
-	pixel_x = 0;
-	pixel_y = 30
-	},
-/obj/machinery/computer/security/xenobio,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aHP" = (
 /turf/simulated/wall/r_wall,
@@ -19817,33 +19806,18 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aLt" = (
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiopen5";
-	name = "Pen 5 Containment";
-	pixel_x = -20;
-	pixel_y = -8;
-	req_access = list(55)
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiopen3";
-	name = "Pen 3 Containment";
-	pixel_x = -20;
-	pixel_y = 8;
-	req_access = list(55)
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiodiv3";
-	name = "Divider 3 Blast Doors";
-	pixel_x = -25;
-	pixel_y = 0;
-	req_access = list(55)
+/obj/item/device/radio/intercom{
+	dir = 1;
+	name = "Station Intercom (General)";
+	pixel_y = 21
 	},
 /obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -35;
-	pixel_y = 0
+	pixel_x = 0;
+	pixel_y = 30
 	},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/computer/security/xenobio,
+/obj/machinery/camera/network/research,
+/turf/simulated/floor/tiled/white,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aLu" = (
 /obj/machinery/button/remote/blast_door{
@@ -20381,29 +20355,15 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aMn" = (
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiodiv6";
-	name = "Divider 6 Blast Doors";
-	pixel_x = 38;
-	pixel_y = 0;
-	req_access = list(55)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 5
 	},
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiopen6";
-	name = "Pen 6 Containment";
-	pixel_x = 30;
-	pixel_y = 8;
-	req_access = list(55)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/machinery/button/remote/blast_door{
-	id = "xenobiopen8";
-	name = "Pen 8 Containment";
-	pixel_x = 30;
-	pixel_y = -8;
-	req_access = list(55)
-	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
+/turf/simulated/floor/reinforced,
+/area/rnd/rdoffice)
 "aMo" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -21977,22 +21937,37 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/drone_fabrication)
-"aPa" = (
-/obj/machinery/camera/network/research/xenobio,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
 "aPb" = (
-/obj/structure/disposalpipe/trunk{
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiopen5";
+	name = "Pen 5 Containment";
+	pixel_x = -20;
+	pixel_y = -8;
+	req_access = list(55)
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiopen3";
+	name = "Pen 3 Containment";
+	pixel_x = -20;
+	pixel_y = 8;
+	req_access = list(55)
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiodiv3";
+	name = "Divider 3 Blast Doors";
+	pixel_x = -25;
+	pixel_y = 0;
+	req_access = list(55)
+	},
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -35;
+	pixel_y = 0
+	},
+/obj/machinery/camera/network/research{
 	dir = 4
 	},
-/obj/structure/disposaloutlet{
-	dir = 8
-	},
-/obj/machinery/camera/network/research/xenobio{
-	icon_state = "camera";
-	dir = 9
-	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aPc" = (
 /obj/structure/disposalpipe/trunk{
@@ -22002,20 +21977,39 @@
 	dir = 4
 	},
 /obj/machinery/camera/network/research/xenobio{
+	dir = 4;
 	icon_state = "camera";
-	dir = 4
+	network = list("Xenobiology")
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aPd" = (
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{
-	scrub_id = "xeno_phoron_pen_scrubbers"
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiodiv6";
+	name = "Divider 6 Blast Doors";
+	pixel_x = 38;
+	pixel_y = 0;
+	req_access = list(55)
 	},
-/obj/machinery/camera/network/research/xenobio{
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiopen6";
+	name = "Pen 6 Containment";
+	pixel_x = 30;
+	pixel_y = 8;
+	req_access = list(55)
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "xenobiopen8";
+	name = "Pen 8 Containment";
+	pixel_x = 30;
+	pixel_y = -8;
+	req_access = list(55)
+	},
+/obj/machinery/camera/network/research{
 	icon_state = "camera";
-	dir = 10
+	dir = 8
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "aPe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -26639,6 +26633,20 @@
 	},
 /turf/simulated/floor,
 /area/tether/surfacebase/security/interrogation)
+"aVI" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/structure/disposaloutlet{
+	dir = 8
+	},
+/obj/machinery/camera/network/research/xenobio{
+	dir = 9;
+	icon_state = "camera";
+	network = list("Xenobiology")
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
 "aVJ" = (
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/security/brig)
@@ -27422,6 +27430,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"aWM" = (
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{
+	scrub_id = "xeno_phoron_pen_scrubbers"
+	},
+/obj/machinery/camera/network/research/xenobio{
+	dir = 10;
+	icon_state = "camera";
+	network = list("Xenobiology")
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
 "aWO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
 	icon_state = "intact";
@@ -34294,7 +34313,7 @@ aab
 aab
 aab
 aHc
-aPa
+aHO
 aHt
 aHt
 aIY
@@ -34313,7 +34332,7 @@ aOJ
 aHt
 aNS
 aKX
-aPd
+aWM
 aHc
 aab
 aab
@@ -34582,15 +34601,15 @@ aHv
 aHS
 aIz
 aIY
-aPb
+aVI
 aKl
 aKX
 aLs
-aPb
+aVI
 aKl
 aKX
 aMP
-aPb
+aVI
 aKl
 aKX
 aHc
@@ -34869,7 +34888,7 @@ aIZ
 aJB
 aKm
 aKZ
-aLt
+aPb
 aJB
 aMi
 aKZ
@@ -35146,7 +35165,7 @@ aab
 aab
 aab
 aHc
-aHO
+aLt
 aHW
 aID
 aJb
@@ -35441,7 +35460,7 @@ aLu
 aJF
 aMl
 aLa
-aMn
+aPd
 aJF
 aNx
 aLa
@@ -35998,7 +36017,7 @@ aab
 aab
 aab
 aHc
-aPa
+aHO
 aHt
 aHt
 aJd
@@ -36017,7 +36036,7 @@ aNX
 aHt
 aKu
 aKW
-aPd
+aWM
 aHc
 aab
 aab
@@ -36098,10 +36117,10 @@ amE
 aho
 ajy
 amH
-aii
-aii
-aii
-aii
+anp
+anp
+anp
+anp
 aok
 aoI
 apt
@@ -36240,10 +36259,10 @@ ahq
 aho
 ajy
 abz
-aii
-asZ
+anp
 anD
 anN
+asZ
 aok
 atK
 apu
@@ -36382,10 +36401,10 @@ amF
 amG
 ajx
 abz
-aii
 anp
 anE
 anO
+aMn
 aok
 aoK
 apv
@@ -36524,7 +36543,7 @@ ahq
 aho
 ajy
 abz
-aii
+anp
 acF
 anF
 anP
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 0da48bde821..1ddc7366d70 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -27071,13 +27071,15 @@
 /turf/simulated/floor,
 /area/maintenance/station/ai)
 "Qn" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_l"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
+/obj/machinery/door/window/southright{
+	req_access = list(58)
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/heads/hos)
 "Qo" = (
 /obj/item/weapon/storage/secure/safe{
 	pixel_x = -28
@@ -27093,15 +27095,15 @@
 /area/medical/virology)
 "Qp" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8
+	dir = 8;
+	icon_state = "propulsion_l"
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/large_escape_pod1/station)
 "Qq" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_r"
+	dir = 8
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -27123,6 +27125,14 @@
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
+"Qs" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_r"
+	},
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
 "Qt" = (
 /turf/simulated/wall,
 /area/tether/exploration)
@@ -28357,16 +28367,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/tether)
-"TZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/door/window/brigdoor/southright{
-	id = "tactical_pet_storage"
-	},
-/turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
 "Ua" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -33898,7 +33898,7 @@ ZF
 je
 Ui
 iS
-TZ
+Qn
 Yu
 Vp
 Ve
@@ -39341,11 +39341,11 @@ MK
 Iy
 ab
 NL
-Qn
-Qp
-Qp
 Qp
 Qq
+Qq
+Qq
+Qs
 NL
 vt
 vt

From 9c6edca3830b559e723441026bcd04e82931d361 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Sat, 30 Nov 2019 07:04:49 -0500
Subject: [PATCH 07/11] SortJunction Fixes

Xenobio, HOP, Robotics, Research tagging destinations confirmed to work.

Known issue: Firing range disposal perma loop.
---
 maps/tether/tether-03-surface3.dmm | 382 ++++++++++++++++-------------
 1 file changed, 208 insertions(+), 174 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 70c8666b7e2..a23f119e331 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -14775,6 +14775,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
 "ayO" = (
@@ -14807,6 +14811,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
 "ayQ" = (
@@ -14874,6 +14881,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
 "ayU" = (
@@ -15181,6 +15191,9 @@
 	dir = 10
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
 "azm" = (
@@ -15437,6 +15450,9 @@
 /obj/machinery/door/airlock/glass_research{
 	name = "Research Staircase"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
 "azH" = (
@@ -15867,22 +15883,30 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aAn" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 4
+/obj/effect/floor_decal/corner/blue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+	dir = 10
 	},
 /obj/structure/disposalpipe/junction{
-	icon_state = "pipe-j1";
-	dir = 4
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/area/tether/surfacebase/surface_three_hall)
 "aAo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15931,13 +15955,16 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/assembly/robotics)
 "aAr" = (
-/obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 1
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 6
 	},
+/obj/structure/disposalpipe/sortjunction{
+	name = "Xenobiology";
+	sortType = "Xenobiology"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aAs" = (
@@ -16318,21 +16345,19 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aAT" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 1
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
 	},
-/obj/effect/floor_decal/corner/mauve/bordercorner{
-	dir = 1
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 5
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 4
-	},
-/obj/structure/disposalpipe/junction,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/area/rnd/staircase/thirdfloor)
 "aAU" = (
 /obj/structure/bed/chair,
 /obj/machinery/firealarm{
@@ -16685,15 +16710,13 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aBj" = (
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass_research{
+	name = "Research Staircase"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 5
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/staircase/thirdfloor)
@@ -16815,26 +16838,23 @@
 /turf/simulated/floor/wood,
 /area/library)
 "aBw" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
 	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/glass_research{
+	name = "Research Staircase"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/area/rnd/staircase/thirdfloor)
 "aBx" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -17464,12 +17484,13 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aCs" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 9
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aCt" = (
@@ -17478,10 +17499,15 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 5
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aCu" = (
@@ -17577,30 +17603,54 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/assembly/robotics)
 "aCB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled,
-/area/rnd/research/testingrange)
-"aCC" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4,
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 10
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 1
 	},
+/obj/effect/floor_decal/corner/mauve/bordercorner{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 4
+	},
+/obj/structure/disposalpipe/junction,
 /turf/simulated/floor/tiled,
-/area/rnd/research/testingrange)
+/area/rnd/research/researchdivision)
+"aCC" = (
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/rnd/research/researchdivision)
 "aCD" = (
-/obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/glass_research{
-	name = "Weapons Testing Range";
-	req_access = list(47)
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 5
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/rnd/research/testingrange)
+/area/rnd/research/researchdivision)
 "aCE" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -17644,10 +17694,16 @@
 /area/library)
 "aCI" = (
 /obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /obj/machinery/door/airlock/glass_research{
 	name = "Weapons Testing Range";
 	req_access = list(47)
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/rnd/research/testingrange)
 "aCJ" = (
@@ -18513,10 +18569,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "aEd" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 5
 	},
@@ -18524,18 +18576,16 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 6
 	},
-/obj/effect/floor_decal/corner/blue/border{
-	dir = 8
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 1
 	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/blue/bordercorner2{
-	dir = 10
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 1;
+	name = "HoP Office";
+	sortType = "HoP Office"
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_three_hall)
@@ -19156,19 +19206,20 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atrium)
 "aFl" = (
-/obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
 	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_research{
-	name = "Research Staircase"
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
-/area/rnd/staircase/thirdfloor)
+/area/rnd/research/testingrange)
 "aFm" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/borderfloor{
@@ -19602,16 +19653,32 @@
 /area/rnd/research/researchdivision)
 "aFQ" = (
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
+/obj/item/device/radio/intercom{
+	dir = 1;
+	pixel_y = 24;
+	req_access = list()
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 1;
+	icon_state = "borderfloor";
+	pixel_y = 0
+	},
+/obj/effect/floor_decal/corner/mauve/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloor/corner2{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/effect/floor_decal/corner/mauve/bordercorner2{
+	dir = 4
+	},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/testingrange)
@@ -21879,18 +21946,9 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/testingrange)
 "aJd" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 1
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 6
-	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
-/area/rnd/research/researchdivision)
+/area/rnd/research/testingrange)
 "aJe" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -26648,10 +26706,12 @@
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/patient_c)
 "aSH" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/research/testingrange)
 "aSI" = (
 /turf/simulated/wall,
 /area/rnd/outpost/xenobiology/outpost_storage)
@@ -27005,6 +27065,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/chemistry)
+"aTe" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass_research{
+	name = "Weapons Testing Range";
+	req_access = list(47)
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/research/testingrange)
 "aTf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -27015,6 +27083,19 @@
 "aTg" = (
 /turf/simulated/wall,
 /area/maintenance/lower/mining)
+"aTh" = (
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 6
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/research/researchdivision)
 "aTi" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -27123,6 +27204,11 @@
 /obj/structure/closet,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining)
+"aTt" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aTw" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 4
@@ -29368,37 +29454,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
-"aXU" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/item/device/radio/intercom{
-	dir = 1;
-	pixel_y = 24;
-	req_access = list()
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 1;
-	icon_state = "borderfloor";
-	pixel_y = 0
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve/bordercorner2{
-	dir = 4
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/machinery/disposal,
-/turf/simulated/floor/tiled,
-/area/rnd/research/testingrange)
 "aXV" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/firstaid/regular,
@@ -30897,27 +30952,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge)
-"baE" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 6
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/surface_three_hall)
 "baG" = (
 /obj/structure/bed/chair/comfy/brown{
 	dir = 8
@@ -38859,7 +38893,7 @@ auu
 axO
 ayB
 aBh
-azG
+aBj
 aCs
 aFP
 aCq
@@ -39000,13 +39034,13 @@ auu
 auu
 axO
 ayN
-aBj
-aFl
-aAn
+aAT
 aBw
 aCt
+aCC
 aCD
-aFQ
+aCI
+aFl
 aBW
 aBW
 aJK
@@ -39148,9 +39182,9 @@ amV
 aFR
 aCK
 azL
-aXU
+aFQ
 aBW
-aCB
+aJd
 aJL
 aKH
 aLo
@@ -39434,7 +39468,7 @@ aCr
 azL
 aoQ
 aCb
-aCC
+aSH
 aJM
 aGl
 aLp
@@ -39576,7 +39610,7 @@ aXM
 azL
 azL
 azL
-aCI
+aTe
 azL
 azL
 azL
@@ -39712,13 +39746,13 @@ aHj
 aAr
 ayu
 aFm
-aAT
+aCB
 aGv
 aXS
 aGR
 aHI
 aHj
-aJd
+aTh
 aJN
 azo
 aac
@@ -45231,8 +45265,8 @@ anL
 bdX
 avi
 avk
+aAn
 aEd
-baE
 baI
 baR
 baT
@@ -45267,7 +45301,7 @@ aNk
 aNl
 aNJ
 aNP
-aSH
+aTt
 aKU
 abg
 aOk
@@ -45409,7 +45443,7 @@ aNl
 aNl
 aNK
 aNP
-aSH
+aTt
 aKU
 abg
 aOk
@@ -45551,7 +45585,7 @@ aNm
 aNl
 aNK
 aNP
-aSH
+aTt
 aKU
 abg
 aOk

From ab82f1ffe0a620fa4385cff65aec80c72cf281ee Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 2 Dec 2019 16:03:58 -0500
Subject: [PATCH 08/11] Cargo Tug Fix

Makes it so the trolleys are mapped in to be connected to the tug.
---
 maps/tether/tether-07-station3.dmm | 77 +++++++++++++++++-------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 1ddc7366d70..01c16c1a70b 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -19733,15 +19733,11 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Et" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/vehicle/train/engine,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/excursion/tether)
 "Eu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
@@ -20213,12 +20209,8 @@
 /area/quartermaster/warehouse)
 "Fk" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/vehicle/train/trolley,
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
+/obj/vehicle/train/engine{
+	dir = 1
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -20776,9 +20768,14 @@
 /area/medical/sleeper)
 "Gd" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/vehicle/train/trolley,
-/obj/machinery/light{
-	dir = 8
+/obj/vehicle/train/trolley{
+	dir = 1
+	},
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -21226,15 +21223,17 @@
 /area/quartermaster/warehouse)
 "GK" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/vehicle/train/trolley,
+/obj/vehicle/train/trolley{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 8
+	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -27
-	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "GL" = (
@@ -27003,10 +27002,20 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "Qh" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/tether)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/vehicle/train/trolley{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
 "Qi" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -40568,7 +40577,7 @@ Zy
 WG
 dj
 XA
-Qh
+Et
 ms
 Oz
 be
@@ -40710,7 +40719,7 @@ UJ
 Xb
 dj
 XN
-Qh
+Et
 ms
 Xq
 be
@@ -40852,7 +40861,7 @@ iW
 WS
 dj
 XN
-Qh
+Et
 ms
 Xq
 be
@@ -41135,7 +41144,7 @@ jZ
 WR
 Xo
 XN
-Qh
+Et
 cK
 ms
 Xq
@@ -41703,7 +41712,7 @@ ea
 kx
 dj
 XN
-Qh
+Et
 cK
 ms
 mq
@@ -41988,7 +41997,7 @@ kQ
 TG
 dj
 XN
-Qh
+Et
 ms
 mq
 be
@@ -42130,7 +42139,7 @@ kR
 Vd
 dj
 XN
-Qh
+Et
 ms
 QL
 be
@@ -42272,7 +42281,7 @@ ZE
 ZB
 dj
 XB
-Qh
+Et
 ms
 Sq
 be
@@ -42727,10 +42736,10 @@ SD
 Qg
 CI
 Dx
-Et
 Fk
 Gd
 GK
+Qh
 HA
 Mg
 EF

From f8ace54d44f4127f3eae5f1344f6ea0d024d9481 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 2 Dec 2019 16:11:13 -0500
Subject: [PATCH 09/11] Oops.

---
 maps/tether/tether-07-station3.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 01c16c1a70b..70e5bbe0ca5 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -19733,7 +19733,6 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "Et" = (
-/obj/structure/cable/green{
 /obj/structure/shuttle/engine/propulsion,
 /turf/simulated/floor/reinforced,
 /turf/simulated/shuttle/plating/airless/carry,

From abce6b47a836b988e18477431effd203626802c4 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Mon, 2 Dec 2019 18:31:52 -0500
Subject: [PATCH 10/11] Gloves and Masks

- Surface Med requested addition of a box of gloves and a box of masks.
---
 maps/tether/tether-02-surface2.dmm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index dae11f24870..b032916c16f 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -21937,6 +21937,20 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/drone_fabrication)
+"aPa" = (
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/camera/network/medbay{
+	dir = 1
+	},
+/obj/item/weapon/storage/box/gloves,
+/obj/item/weapon/storage/box/masks{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/storage)
 "aPb" = (
 /obj/machinery/button/remote/blast_door{
 	id = "xenobiopen5";
@@ -25159,14 +25173,6 @@
 /obj/structure/bed/padded,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/solitary)
-"aTK" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/camera/network/medbay{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/storage)
 "aTL" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -45600,7 +45606,7 @@ aRk
 aRB
 aRU
 aSo
-aTK
+aPa
 aad
 aad
 aad

From 6543af8977f247b75f8320da14c2586b4229aa47 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Thu, 5 Dec 2019 18:35:23 -0500
Subject: [PATCH 11/11] Missing Air Alarm

---
 maps/tether/tether-06-station2.dmm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index f2d3d595b06..37b32b119c0 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -15187,6 +15187,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/exam_room)
+"wV" = (
+/obj/machinery/alarm{
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor,
+/area/maintenance/station/micro)
 "wZ" = (
 /obj/effect/landmark/start{
 	name = "Medical Doctor"
@@ -34943,7 +34951,7 @@ sF
 sF
 yJ
 eT
-eT
+wV
 yJ
 yG
 sB