Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/game/objects/structures/crates_lockers/closets.dm

@@ -414,19 +414,18 @@
 
 	visible_message("<span class='danger'>\The [src] begins to shake violently!</span>")
 
-	spawn(0)
-		breakout = 1 //can't think of a better way to do this right now.
-		for(var/i in 1 to (6*breakout_time * 2)) //minutes * 6 * 5seconds * 2
-			if(!do_after(escapee, 50)) //5 seconds
-				breakout = 0
-				return
-			if(!escapee || escapee.incapacitated() || escapee.loc != src)
-				breakout = 0
-				return //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
-			//Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
-			if(!req_breakout())
-				breakout = 0
-				return
+	breakout = 1 //can't think of a better way to do this right now.
+	for(var/i in 1 to (6*breakout_time * 2)) //minutes * 6 * 5seconds * 2
+		if(!do_after(escapee, 50)) //5 seconds
+			breakout = 0
+			return
+		if(!escapee || escapee.incapacitated() || escapee.loc != src)
+			breakout = 0
+			return //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
+		//Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
+		if(!req_breakout())
+			breakout = 0
+			return
 
 			playsound(src, breakout_sound, 100, 1)
 			animate_shake()

code/game/objects/structures/window.dm

@@ -424,6 +424,11 @@
 /obj/structure/window/proc/is_fulltile()
 	return fulltile
 
+/obj/structure/window/is_between_turfs(var/turf/origin, var/turf/target)
+	if(fulltile)
+		return TRUE
+	return ..()
+
 //This proc is used to update the icons of nearby windows. It should not be confused with update_nearby_tiles(), which is an atmos proc!
 /obj/structure/window/proc/update_nearby_icons()
 	update_icon()