Merge pull request #1467 from Fox-McCloud/del-the-dels

Replaces Remaining Del()'s

code/modules/computer3/laptop.dm

@@ -180,13 +180,13 @@
 		else
 			stat &= ~NOPOWER
 
-	Del()
+	Destroy()
 		if(istype(loc,/obj/item/device/laptop))
 			var/obj/O = loc
 			spawn(5)
 				if(O)
-					del O
-		..()
+					qdel(O)
+		return ..()
 
 
 	AltClick()

code/modules/food/customizables.dm

@@ -377,10 +377,10 @@
 		T.pixel_y = (ingredients.len * 2)+1
 		overlays += T
 
-/obj/item/weapon/reagent_containers/food/snacks/customizable/Del()
+/obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
 	for(var/obj/item/O in ingredients)
-		del(O)
-	..()
+		qdel(O)
+	return ..()
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/examine()
 	..()

code/modules/mob/holder.dm

@@ -9,9 +9,9 @@
 	..()
 	processing_objects.Add(src)
 
-/obj/item/weapon/holder/Del()
+/obj/item/weapon/holder/Destroy()
 	processing_objects.Remove(src)
-	..()
+	return ..()
 
 /obj/item/weapon/holder/process()
 

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

@@ -243,7 +243,7 @@ var/list/ai_verbs_default = list(
 /obj/machinery/ai_powersupply/New(var/mob/living/silicon/ai/ai=null)
 	powered_ai = ai
 	if(isnull(powered_ai))
-		Del()
+		qdel(src)
 
 	loc = powered_ai.loc
 	use_power(1) // Just incase we need to wake up the power system.
@@ -252,7 +252,7 @@ var/list/ai_verbs_default = list(
 
 /obj/machinery/ai_powersupply/process()
 	if(!powered_ai || powered_ai.stat & DEAD)
-		Del()
+		qdel(src)
 	if(!powered_ai.anchored)
 		loc = powered_ai.loc
 		use_power = 0

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

@@ -100,10 +100,10 @@
 	spawn(5)
 		eyeobj.loc = src.loc
 
-/mob/living/silicon/ai/Del()
+/mob/living/silicon/ai/Destroy()
 	eyeobj.ai = null
-	del(eyeobj) // No AI, no Eye
-	..()
+	qdel(eyeobj) // No AI, no Eye
+	return ..()
 
 /atom/proc/move_camera_by_click()
 	if(istype(usr, /mob/living/silicon/ai))

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

@@ -23,10 +23,10 @@
 
 // STRUCTURES
 
-/obj/structure/Del()
+/obj/structure/Destroy()
 	if(ticker)
 		cameranet.updateVisibility(src)
-	..()
+	return ..()
 
 /obj/structure/New()
 	..()
@@ -35,10 +35,10 @@
 
 // EFFECTS
 
-/obj/effect/Del()
+/obj/effect/Destroy()
 	if(ticker)
 		cameranet.updateVisibility(src)
-	..()
+	return ..()
 
 /obj/effect/New()
 	..()
@@ -99,11 +99,11 @@
 	if(open_networks.len) //If there is at least one open network, chunk is available for AI usage.
 		cameranet.addCamera(src)
 
-/obj/machinery/camera/Del()
+/obj/machinery/camera/Destroy()
 	cameranet.cameras -= src
 	var/list/open_networks = difflist(network,restricted_camera_networks)
 	if(open_networks.len)
 		cameranet.removeCamera(src)
-	..()
+	return ..()
 
 #undef BORG_CAMERA_BUFFER

code/modules/mob/mob_grab.dm

@@ -404,18 +404,13 @@
 /obj/item/weapon/grab/dropped()
 	qdel(src)
 
-/obj/item/weapon/grab/Del()
-	//make sure the grabbed_by list doesn't fill up with nulls
-	if(affecting) affecting.grabbed_by -= src
-	..()
-
 /obj/item/weapon/grab/Destroy()
 	if(affecting)
 		affecting.pixel_x = 0
 		affecting.pixel_y = 0 //used to be an animate, not quick enough for del'ing
 		affecting.layer = initial(affecting.layer)
 		affecting.grabbed_by -= src
-	del(hud)
+	qdel(hud)
 	return ..()
 
 #undef EAT_TIME_XENO

code/modules/mob/spirit/spirit.dm

@@ -29,38 +29,38 @@ mob/spirit/is_active()
 	if (client && client.inactivity <= 10 * 60 * 10)
 		return TRUE
 	return FALSE
-	
-	
+
+
 mob/spirit/New()
 	sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
 	see_invisible = SEE_SPIRITS
 	see_in_dark = 100
 
 	loc = pick(latejoin)
-	
+
 	// no nameless spirits
 	if (!name)
 		name = "Boogyman"
-	
+
 	spirits+=src
-	
+
 	..()
-	
-mob/spirit/Del()
+
+mob/spirit/Destroy()
 	spirits-=src
-	..()
-	
-	
+	return ..()
+
+
 mob/spirit/Topic(href, href_list)
-	
+
 	if(usr != src)
 		return
 	..()
-	
+
 	usr << "Spirit Href = [href]"
 	for (var/tempref in href_list)
 		usr << "Spirit href list [tempref] = [href_list[tempref]]"
-	
+
 	if (href_list["track"])
 		usr << "Got to tracking."
 		var/mob/target = locate(href_list["track"]) in mob_list

code/modules/mob/spirit/viewpoint.dm

@@ -23,11 +23,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
 	..()
 
 
-/obj/cult_viewpoint/Del()
+/obj/cult_viewpoint/Destroy()
 	processing_objects.Remove(src)
 	cult_viewpoints-=src
-	..()
-	return
+	return ..()
 
 
 // VERBS

code/modules/ninja/energy_katana.dm

@@ -73,12 +73,6 @@
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-
-/obj/item/weapon/katana/energy/Del()
-	qdel(spark_system)
-	spark_system = null
-	..()
-
 /obj/item/weapon/katana/energy/Destroy()
 	qdel(spark_system)
 	spark_system = null

code/modules/projectiles/guns/alien.dm

@@ -20,9 +20,9 @@
 	processing_objects.Add(src)
 	last_regen = world.time
 
-/obj/item/weapon/gun/launcher/spikethrower/Del()
+/obj/item/weapon/gun/launcher/spikethrower/Destroy()
 	processing_objects.Remove(src)
-	..()
+	return ..()
 
 /obj/item/weapon/gun/launcher/spikethrower/process()
 

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

@@ -48,9 +48,9 @@
 	..()
 	processing_objects.Add(src)
 
-/obj/item/weapon/gun/energy/floragun/Del()
+/obj/item/weapon/gun/energy/floragun/Destroy()
 	processing_objects.Remove(src)
-	..()
+	return ..()
 
 /obj/item/weapon/gun/energy/floragun/process()
 	charge_tick++