Merge pull request #2335 from Fox-McCloud/fix-dem-destroys

Last Few Destroy Fixes

code/modules/admin/buildmode.dm

@@ -50,6 +50,12 @@
 	icon = 'icons/misc/buildmode.dmi'
 	var/obj/effect/bmode/buildholder/master = null
 
+/obj/effect/bmode/Destroy()
+	if(master && master.cl)
+		master.cl.screen -= src
+	master = null
+	return ..()
+
 /obj/effect/bmode/builddir
 	icon_state = "build"
 	screen_loc = "NORTH,WEST"
@@ -133,6 +139,19 @@
 	var/turf/cornerB = null
 	var/generator_path = null
 
+/obj/effect/bmode/buildholder/Destroy()
+	qdel(builddir)
+	builddir = null
+	qdel(buildhelp)
+	buildhelp = null
+	qdel(buildmode)
+	buildmode = null
+	qdel(buildquit)
+	buildquit = null
+	throw_atom = null
+	cl = null
+	return ..()
+
 /obj/effect/bmode/buildmode
 	icon_state = "buildmode1"
 	screen_loc = "NORTH,WEST+2"

code/modules/clothing/suits/storage.dm

@@ -8,6 +8,11 @@
 	pockets.max_w_class = 2		//fit only pocket sized items
 	pockets.max_combined_w_class = 4
 
+/obj/item/clothing/suit/storage/Destroy()
+	qdel(pockets)
+	pockets = null
+	return ..()
+
 /obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
 	if (pockets.handle_attack_hand(user))
 		..(user)

code/modules/computer3/laptop.dm

@@ -52,7 +52,7 @@
 					O.forceMove(loc)
 			usr << "\The [src] crumbles to pieces."
 			spawn(5)
-				qdel(src) 
+				qdel(src)
 			return
 
 		if(!stored_computer.manipulating)
@@ -65,7 +65,7 @@
 
 			spawn(5)
 				stored_computer.manipulating = 0
-				qdel(src) 
+				qdel(src)
 		else
 			usr << "\red You are already opening the computer!"
 
@@ -73,8 +73,9 @@
 	AltClick()
 		if(Adjacent(usr))
 			open_computer()
-		
+
 	Destroy()
+		..()
 		return QDEL_HINT_HARDDEL_NOW // Warning: GC'ing will cause the laptop to vanish when it next closes
 
 //Quickfix until Snapshot works out how he wants to redo power. ~Z

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -32,8 +32,13 @@
 	src.emag.name = "Placeholder Emag Item"
 
 /obj/item/weapon/robot_module/Destroy()
+	for(var/module in modules)
+		qdel(module)
 	modules.Cut()
+	qdel(emag)
 	emag = null
+	qdel(jetpack)
+	jetpack = null
 	return ..()
 
 /obj/item/weapon/robot_module/proc/fix_modules()