diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 8e823527c10bc..98068803b20a0 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -149,10 +149,6 @@
 	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/research)
-"bd" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/space,
-/area/awaymission/undergroundoutpost45/central)
 "be" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Security Office";
@@ -43375,7 +43371,7 @@ Ba
 Kj
 Mr
 aD
-bd
+qE
 uO
 Or
 qE
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 96863b1cf8f29..038ec31ca3030 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -22907,7 +22907,7 @@
 /obj/machinery/door/poddoor{
 	id = "deathdoor"
 	},
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/security/execution/education)
 "hoR" = (
 /obj/structure/cable/yellow{
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8ab7d11d37622..cdd3b61c02dae 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -13534,7 +13534,7 @@
 	},
 /obj/structure/cable/yellow,
 /obj/effect/spawner/structure/window/reinforced,
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/quartermaster/storage)
 "bPv" = (
 /obj/item/kirbyplants/random,
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 0de0b73ac4ee4..0c8da73e46f2a 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -95213,10 +95213,15 @@
 /turf/open/floor/grass,
 /area/hallway/secondary/entry)
 "xOR" = (
+/obj/effect/spawner/structure/window/reinforced/prison,
+/obj/machinery/door/poddoor/preopen{
+	id = "Prisongate";
+	name = "Prison Blast Door"
+	},
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/security/prison)
 "xOV" = (
 /obj/structure/sign/warning/vacuum/external,
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b5ea559ea7f2b..3c9e4f6ef72e4 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -5803,10 +5803,6 @@
 /obj/effect/turf_decal/tile/green/fourcorners/contrasted,
 /turf/open/floor/iron/white,
 /area/centcom/holding)
-"wk" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/iron/dark,
-/area/centcom/supplypod)
 "wl" = (
 /obj/machinery/light,
 /turf/open/floor/wood,
@@ -13107,7 +13103,7 @@
 /area/centcom/control)
 "XK" = (
 /obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/iron,
+/turf/open/floor/plating,
 /area/centcom/supplypod)
 "XL" = (
 /obj/machinery/door/airlock/wood,
@@ -13156,10 +13152,6 @@
 	},
 /turf/open/floor/iron,
 /area/tdome/tdomeobserve)
-"XT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/space/basic,
-/area/centcom/supplypod)
 "XW" = (
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 8
@@ -64494,8 +64486,8 @@ Yn
 Yn
 Yn
 Yn
-wk
-wk
+XK
+XK
 Yn
 Yn
 Yn
@@ -66283,8 +66275,8 @@ RC
 qx
 qx
 qx
-XT
-XT
+XK
+XK
 Yn
 Yn
 Yn
diff --git a/tools/maplint/lints/space_check.yml b/tools/maplint/lints/space_check.yml
new file mode 100644
index 0000000000000..789a39b12cf7c
--- /dev/null
+++ b/tools/maplint/lints/space_check.yml
@@ -0,0 +1,5 @@
+help: "Space isn't supposed to be under doors or windows"
+/turf/open/space:
+  banned_neighbors:
+  - /obj/machinery/door
+  - /obj/effect/spawner/structure/window