Merge pull request #1471 from Fox-McCloud/destroy-them-all

Destroy Pass II

code/modules/assembly/shock_kit.dm

@@ -10,8 +10,8 @@
 	flags = CONDUCT
 
 /obj/item/assembly/shock_kit/Destroy()
-	del(part1)
-	del(part2)
+	qdel(part1)
+	qdel(part2)
 	return ..()
 
 /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/modules/mob/dead/observer/observer.dm

@@ -89,7 +89,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 /mob/dead/observer/Destroy()
 	if (ghostimage)
 		ghost_darkness_images -= ghostimage
-		del(ghostimage)
+		qdel(ghostimage)
 		ghostimage = null
 		updateallghostimages()
 	return ..()

code/modules/mob/living/carbon/brain/MMI.dm

@@ -165,3 +165,12 @@
 			if(3)
 				brainmob.emp_damage += rand(0,10)
 	..()
+
+/obj/item/device/mmi/Destroy()
+	if(isrobot(loc))
+		var/mob/living/silicon/robot/borg = loc
+		borg.mmi = null
+	if(brainmob)
+		qdel(brainmob)
+		brainmob = null
+	return ..()

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -88,4 +88,10 @@
 	name = "chem"
 	desc = "A tightly furled roll of paper, covered with indecipherable runes."
 	icon = 'icons/obj/wizard.dmi'
-	icon_state = "scroll"
+	icon_state = "scroll"
+
+/obj/item/organ/brain/Destroy() //copypasted from MMIs.
+	if(brainmob)
+		qdel(brainmob)
+		brainmob = null
+	return ..()

code/modules/mob/living/carbon/carbon.dm

@@ -6,6 +6,13 @@ mob/living
 	update_hud()
 	return
 
+/mob/living/carbon/Destroy()
+	for(var/atom/movable/guts in internal_organs)
+		qdel(guts)
+	for(var/atom/movable/food in stomach_contents)
+		qdel(food)
+	return ..()
+
 /mob/living/carbon/Life()
 	..()
 

code/modules/mob/living/carbon/human/human.dm

@@ -50,6 +50,12 @@
 		dna.ready_dna(src)
 	UpdateAppearance()
 
+/mob/living/carbon/human/Destroy()
+	for(var/atom/movable/organelle in organs)
+		qdel(organelle)
+	organs = list()
+	return ..()
+
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH

code/modules/mob/living/living.dm

@@ -1,4 +1,8 @@
 
+/mob/living/Destroy()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
 /mob/living/Life()
 	..()
 	if (notransform)	return

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -26,7 +26,7 @@
 /mob/aiEye/Destroy()
 	if (ghostimage)
 		ghost_darkness_images -= ghostimage
-		del(ghostimage)
+		qdel(ghostimage)
 		ghostimage = null;
 		updateallghostimages()
 	return ..()

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

@@ -24,7 +24,7 @@
 
 /datum/robot_component/proc/destroy()
 	if(wrapped)
-		del wrapped
+		qdel(wrapped)
 
 
 	wrapped = new/obj/item/broken_device

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

@@ -174,11 +174,19 @@ var/list/robot_verbs_default = list(
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 //Improved /N
 /mob/living/silicon/robot/Destroy()
-	if(mmi)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
+	if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
 		var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
 		if(T)	mmi.loc = T
-		if(mind)	mind.transfer_to(mmi.brainmob)
+		if(mmi.brainmob)
+			mind.transfer_to(mmi.brainmob)
+			mmi.update_icon()
+		else
+			src << "<span class='boldannounce'>Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.</span>"
+			ghostize()
+			error("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].")
 		mmi = null
+	if(connected_ai)
+		connected_ai.connected_robots -= src
 	return ..()
 
 /mob/living/silicon/robot/proc/pick_module()

code/modules/mob/mob.dm

@@ -2,6 +2,9 @@
 	mob_list -= src
 	dead_mob_list -= src
 	living_mob_list -= src
+	qdel(hud_used)
+	if(mind && mind.current == src)
+		spellremove(src)
 	ghostize()
 	return ..()
 

code/modules/power/apc.dm

@@ -1330,6 +1330,9 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
 	area.power_change()
 	if(occupant)
 		malfvacate(1)
+	qdel(wires)
+	if(cell)
+		qdel(cell)
 	return ..()
 
 /obj/machinery/power/apc/proc/shock(mob/user, prb)

code/modules/power/supermatter/supermatter.dm

@@ -72,7 +72,7 @@
 /obj/machinery/power/supermatter_shard/Destroy()
 	investigate_log("has been destroyed.", "supermatter")
 	qdel(radio)
-	. = ..()
+	return ..()
 
 /obj/machinery/power/supermatter_shard/proc/explode()
 	investigate_log("has exploded.", "supermatter")

code/modules/projectiles/guns/energy/temperature.dm

@@ -19,7 +19,7 @@
 
 	Destroy()
 		processing_objects.Remove(src)
-		..()
+		return ..()
 
 
 	attack_self(mob/living/user as mob)

code/modules/recycling/disposal.dm

@@ -678,7 +678,7 @@
 				for(var/atom/movable/AM in H)
 					AM.loc = T
 					AM.pipe_eject(0)
-				del(H)
+				qdel(H)
 				..()
 				return