Merge pull request #8121 from VOREStation/Arokha/morefloor

Further Eris floor blending tweaks

code/game/objects/items/stacks/stack.dm

@@ -364,10 +364,7 @@
 		return ..()
 
 /obj/item/stack/proc/combine_in_loc()
-	for(var/obj/item/stack/S in loc)
-		if(S == src)
-			continue
-		S.transfer_to(src) // them to us, so if we're being pulled, we can keep being pulled
+	return //STUBBED for now, as it seems to randomly delete stacks
 
 /obj/item/stack/dropped(atom/old_loc)
 	. = ..()

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()