From 09fea6902c50f0fa721a49fa64d4b0fb8696af13 Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Mon, 11 Jul 2022 12:18:04 +0200
Subject: [PATCH] Fixes Windows and Window Frames on Centcomm Not Smoothing
 (#14416)

---
 code/game/objects/structures/full_window_frame.dm |  3 +++
 code/game/objects/structures/window.dm            |  4 ++--
 code/game/turfs/unsimulated/walls.dm              | 10 ++++++++--
 html/changelogs/centcomm_smooth_fix.yml           |  6 ++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/centcomm_smooth_fix.yml

diff --git a/code/game/objects/structures/full_window_frame.dm b/code/game/objects/structures/full_window_frame.dm
index 7a72e0e53c5..47b1205b24b 100644
--- a/code/game/objects/structures/full_window_frame.dm
+++ b/code/game/objects/structures/full_window_frame.dm
@@ -12,6 +12,9 @@
 	canSmoothWith = list(
 		/turf/simulated/wall,
 		/turf/simulated/wall/r_wall,
+		/turf/unsimulated/wall/steel, // Centcomm wall.
+		/turf/unsimulated/wall/darkshuttlewall, // Centcomm wall.
+		/turf/unsimulated/wall/riveted, // Centcomm wall.
 		/obj/structure/window_frame,
 		/obj/structure/window_frame/unanchored,
 		/obj/structure/window_frame/empty
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index aae9f1724e2..0d3951a6dbd 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -762,10 +762,10 @@
 	base_frame = /obj/structure/window_frame
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(
-		/turf/simulated/wall,
-		/turf/simulated/wall/r_wall,
 		/obj/structure/window/full/reinforced,
+		/obj/structure/window/full/reinforced/indestructible,
 		/obj/structure/window/full/reinforced/polarized,
+		/obj/structure/window/full/reinforced/polarized/indestructible,
 		/obj/structure/window/full/phoron/reinforced
 	)
 
diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm
index ad32913698a..e9a9e84fab7 100644
--- a/code/game/turfs/unsimulated/walls.dm
+++ b/code/game/turfs/unsimulated/walls.dm
@@ -25,7 +25,10 @@
 	canSmoothWith = list(
 		/turf/unsimulated/wall/riveted,
 		/obj/machinery/door/airlock/centcom,
-		/turf/unsimulated/wall/fakepdoor
+		/turf/unsimulated/wall/fakepdoor,
+		/obj/structure/window_frame,
+		/obj/structure/window_frame/unanchored,
+		/obj/structure/window_frame/empty
 	)
 
 /turf/unsimulated/wall/fakepdoor
@@ -51,7 +54,10 @@
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(
 		/turf/unsimulated/wall/darkshuttlewall,
-		/turf/unsimulated/wall/riveted
+		/turf/unsimulated/wall/riveted,
+		/obj/structure/window_frame,
+		/obj/structure/window_frame/unanchored,
+		/obj/structure/window_frame/empty
 	)
 
 /turf/unsimulated/wall/fakeairlock
diff --git a/html/changelogs/centcomm_smooth_fix.yml b/html/changelogs/centcomm_smooth_fix.yml
new file mode 100644
index 00000000000..77bb5473436
--- /dev/null
+++ b/html/changelogs/centcomm_smooth_fix.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes windows and window frames on Centcomm not smoothing."
\ No newline at end of file