From 5f8d368d9f0170b9b35e815b4115348853ab1697 Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Thu, 9 Nov 2017 09:06:43 -0800
Subject: [PATCH 1/2] Fix bluespace shelters smoothing with non-shelter walls
 (#32526)

---
 _maps/templates/shelter_2.dmm                   | 16 ++++++++--------
 code/game/turfs/simulated/wall/mineral_walls.dm |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index 9f3827e5c3..e9489df641 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -214,9 +214,9 @@
 (1,1,1) = {"
 a
 d
-c
+a
 d
-c
+a
 d
 a
 "}
@@ -230,13 +230,13 @@ y
 C
 "}
 (3,1,1) = {"
-c
+a
 f
 l
 l
 u
 z
-c
+a
 "}
 (4,1,1) = {"
 b
@@ -248,13 +248,13 @@ A
 D
 "}
 (5,1,1) = {"
-c
+a
 h
 n
 r
 w
 A
-c
+a
 "}
 (6,1,1) = {"
 b
@@ -268,9 +268,9 @@ E
 (7,1,1) = {"
 a
 j
-c
+a
 j
-c
+a
 j
 a
 "}
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 0578861074..ad85568267 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -222,13 +222,13 @@
 	icon = 'icons/turf/walls/survival_pod_walls.dmi'
 	icon_state = "smooth"
 	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
-	canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod, /obj/structure/shuttle/engine)
+	canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
 
 /turf/closed/wall/mineral/titanium/survival/nodiagonal
 	smooth = SMOOTH_MORE
 
 /turf/closed/wall/mineral/titanium/survival/pod
-	canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
+	canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
 
 /////////////////////Plastitanium walls/////////////////////