Merge pull request #3511 from VOREStation/garbage-subsystem

tg Garbage Subsystem

code/game/objects/structures/lattice.dm

@@ -39,7 +39,7 @@
 		spawn(1)
 			if(istype(O)) // If we built a new floor with the lattice, the open turf won't exist anymore.
 				O.update() // This lattice may be supporting things on top of it.  If it's being deleted, they need to fall down.
-	..()
+	. = ..()
 
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)

code/game/objects/structures/window.dm

@@ -355,12 +355,9 @@
 	density = 0
 	update_nearby_tiles()
 	var/turf/location = loc
-	loc = null
+	. = ..()
 	for(var/obj/structure/window/W in orange(location, 1))
 		W.update_icon()
-	loc = location
-	..()
-
 
 /obj/structure/window/Move()
 	var/ini_dir = dir