From b0a98f0c18c76f2c9b39d516e8c21daec556e96e Mon Sep 17 00:00:00 2001
From: Kabra_men <46802162+Kabramen@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:31:17 -0300
Subject: [PATCH] sandstone walls now can connect to windows

---
 code/game/objects/structures/false_walls.dm     | 2 +-
 code/game/objects/structures/window.dm          | 4 +++-
 code/game/turfs/simulated/wall/mineral_walls.dm | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index b194548f..e359325d 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -271,7 +271,7 @@
 	icon_state = "sandstone"
 	mineral = /obj/item/stack/sheet/mineral/sandstone
 	walltype = /turf/closed/wall/mineral/sandstone
-	canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone)
+	canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone, /obj/structure/window/fulltile)
 
 /obj/structure/falsewall/wood
 	name = "wooden wall"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 4b6b0689..ca698d44 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -516,7 +516,9 @@
 	/obj/machinery/door/airlock/hatch,
 	/obj/machinery/door/airlock/engineering/glass/critical,
 	/obj/machinery/door/airlock/atmos,
-	/obj/machinery/door/airlock/highsecurity,)
+	/obj/machinery/door/airlock/highsecurity,
+	/turf/closed/wall/mineral/sandstone,
+	/obj/structure/falsewall/sandstone,)
 //	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
 	glass_amount = 2
 
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index b37b5ec6..1e994b01 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -49,7 +49,7 @@
 	icon_state = "sandstone"
 	sheet_type = /obj/item/stack/sheet/mineral/sandstone
 	explosion_block = 0
-	canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone)
+	canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone, /obj/structure/window/fulltile)
 
 /turf/closed/wall/mineral/uranium
 	article = "a"