diff --git a/_maps/map_files/generic/z5.dmm b/_maps/map_files/generic/z5.dmm
diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm
@@ -29,5 +29,5 @@ again.
 	icon_state = "rwindow_spawner"
 	spawn_list = 	list(
 						/obj/structure/grille,
-						/obj/structure/window/fulltile/reinforced
+						/obj/structure/window/reinforced/fulltile
 						)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
@@ -206,7 +206,7 @@
 				user << "<span class='warning'>There is a window in the way!</span>"
 				return 1
 			var/obj/structure/window/W
-			W = new /obj/structure/window/fulltile/reinforced(user.loc, 1)
+			W = new /obj/structure/window/reinforced/fulltile(user.loc, 1)
 			W.state = 0
 			W.anchored = 0
 			W.add_fingerprint(user)

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
@@ -186,7 +186,7 @@
 					return
 				var/obj/structure/window/WD
 				if(istype(W, /obj/item/stack/sheet/rglass))
-					WD = new/obj/structure/window/fulltile/reinforced(loc) //reinforced window
+					WD = new/obj/structure/window/reinforced/fulltile(loc) //reinforced window
 				else
 					WD = new/obj/structure/window/fulltile(loc) //normal window
 				WD.dir = dir_to_set

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -465,34 +465,34 @@
 	dir = 5
 	maxhealth = 50
 	fulltile = 1
-	smooth = SMOOTH_MORE
-	canSmoothWith = list(/obj/structure/window/fulltile)
+	smooth = SMOOTH_TRUE
+	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
 
-/obj/structure/window/fulltile/reinforced
+/obj/structure/window/reinforced/fulltile
 	icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
 	icon_state = "r_window"
+	dir = 5
 	maxhealth = 100
+	fulltile = 1
+	smooth = SMOOTH_TRUE
+	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
 	level = 3
 
-/obj/structure/window/fulltile/reinforced/ex_act(severity, target)
-	switch(severity)
-		if(1)
-			qdel(src)
-		if(2)
-			spawnfragments()
-		if(3)
-			if(prob(50))
-				spawnfragments()
-
-/obj/structure/window/fulltile/reinforced/tinted
+/obj/structure/window/reinforced/tinted/fulltile
 	icon = 'icons/obj/smooth_structures/tinted_window.dmi'
 	icon_state = "tinted_window"
-	opacity = 1
+	dir = 5
+	fulltile = 1
+	smooth = SMOOTH_TRUE
+	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile/)
+	level = 3
 
-/obj/structure/window/fulltile/reinforced/ice
+/obj/structure/window/reinforced/fulltile/ice
 	icon = 'icons/obj/smooth_structures/rice_window.dmi'
 	icon_state = "ice_window"
 	maxhealth = 150
+	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/reinforced/fulltile/ice)
+	level = 3
 
 /obj/structure/window/shuttle
 	name = "shuttle window"

diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
@@ -48,11 +48,10 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 	return ..()
 
 /turf/simulated/floor/ex_act(severity, target)
-	if(severity != 1 && is_shielded() && target != src)
-		..()
+	var/shielded = is_shielded()
+	..()
+	if(severity != 1 && shielded && target != src)
 		return
-	else
-		..()
 	if(target == src)
 		src.ChangeTurf(src.baseturf)
 	if(target != null)