From 69670ce5446db4c8eeec05c53f3f59fdf2b50279 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Mon, 11 Jun 2018 10:22:05 -0400
Subject: [PATCH] Merge conflict fix

---
 maps/tether/tether-06-station2.dmm | 70 +++++++++++++++++-------------
 maps/tether/tether-07-station3.dmm | 46 +++++++++++---------
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index 67d3a75d22a..6210eb82457 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -17600,6 +17600,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/prison)
+"Ey" = (
+/turf/simulated/floor/reinforced/airless,
+/area/space)
 "ED" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -18101,6 +18104,11 @@
 /obj/random/maintenance/medical,
 /turf/simulated/floor,
 /area/maintenance/station/sec_lower)
+"NS" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/space,
+/area/space)
 "NY" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -22628,16 +22636,16 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+NS
+NS
+NS
+NS
+NS
+NS
+NS
+eM
+NS
+NS
 aa
 aa
 aa
@@ -22770,6 +22778,7 @@ aa
 aa
 aa
 aa
+NS
 aa
 aa
 aa
@@ -22778,8 +22787,7 @@ aa
 aa
 aa
 aa
-aa
-aa
+NS
 aa
 aa
 aa
@@ -22912,7 +22920,7 @@ aa
 aa
 aa
 aa
-aa
+NS
 aa
 aa
 aa
@@ -23054,7 +23062,7 @@ aa
 aa
 aa
 aa
-aa
+NS
 aa
 aa
 aa
@@ -23196,7 +23204,7 @@ aa
 aa
 aa
 aa
-aa
+NS
 aa
 aa
 aa
@@ -23338,14 +23346,14 @@ aa
 aa
 aa
 aa
-aa
+NS
 aa
 aa
 aa
 ab
-ac
-ac
-at
+Ey
+Ey
+Ey
 Qs
 Qs
 at
@@ -23480,14 +23488,14 @@ aa
 aa
 aa
 aa
+NS
 aa
 aa
 aa
-aa
-ac
-ac
-ac
-Qs
+ab
+Ey
+Ey
+Ey
 Qs
 Qs
 at
@@ -23622,14 +23630,14 @@ aa
 aa
 aa
 aa
-aa
+eM
 aa
 aa
 aa
 ac
-ac
-at
-Qs
+Ey
+Ey
+kk
 Qs
 Ug
 at
@@ -23764,7 +23772,7 @@ aa
 aa
 aa
 aa
-aa
+NS
 aa
 ab
 ab
@@ -23906,8 +23914,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+NS
+NS
 ac
 ac
 ac
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 58e18710b90..de47d879d0a 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -23475,6 +23475,10 @@
 /obj/random/maintenance/engineering,
 /turf/simulated/floor,
 /area/maintenance/station/ai)
+"Wf" = (
+/obj/structure/grille,
+/turf/space,
+/area/space)
 "WD" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/red/border,
@@ -27344,16 +27348,16 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nA
+nA
+nA
+nA
+Wf
+nA
+nA
+nB
+nA
+nA
 aa
 aa
 aa
@@ -27486,6 +27490,7 @@ aa
 aa
 aa
 aa
+nA
 aa
 aa
 aa
@@ -27494,8 +27499,7 @@ aa
 aa
 aa
 aa
-aa
-aa
+nA
 aa
 aa
 aa
@@ -27628,7 +27632,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -27770,7 +27774,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -27912,7 +27916,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -28054,7 +28058,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -28196,7 +28200,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -28338,7 +28342,7 @@ aa
 aa
 aa
 aa
-aa
+nB
 aa
 aa
 aa
@@ -28480,7 +28484,7 @@ aa
 aa
 aa
 aa
-aa
+nA
 aa
 aa
 aa
@@ -28622,8 +28626,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nA
+nA
 ab
 ab
 ab