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

Replaces Remaining Del()'s

code/game/gamemodes/cult/ritual.dm

@@ -74,9 +74,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 		AI.client.images += blood
 	cult_viewpoints += src
 
-/obj/effect/rune/Del()
-	..()
+/obj/effect/rune/Destroy()
 	cult_viewpoints -= src
+	return ..()
 
 /obj/effect/rune/examine()
 	set src in view(2)

code/game/gamemodes/objective.dm

@@ -20,9 +20,9 @@ datum/objective
 		if(text)
 			explanation_text = text
 
-	Del()
+	Destroy()
 		all_objectives -= src
-		..()
+		return ..()
 
 	proc/check_completion()
 		return completed

code/game/jobs/job_objective.dm

@@ -22,7 +22,7 @@
 	owner=new_owner
 	owner.job_objectives += src
 
-/datum/job_objective/Del()
+/datum/job_objective/Destroy()
 
 /datum/job_objective/proc/get_description()
 	return "Placeholder objective."

code/game/machinery/hologram.dm

@@ -196,10 +196,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	del(src)
 	return
 
-/obj/machinery/hologram/Del()
+/obj/machinery/hologram/Destroy()
 	if(hologram)
 		src:clear_holo()
-	..()
+	return ..()
 
 /*
 Holographic project of everything else.

code/game/machinery/telecomms/broadcaster.dm

@@ -97,11 +97,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 		/* --- Do a snazzy animation! --- */
 		flick("broadcaster_send", src)
 
-/obj/machinery/telecomms/broadcaster/Del()
+/obj/machinery/telecomms/broadcaster/Destroy()
 	// In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore.
 	if(message_delay)
 		message_delay = 0
-	..()
+	return ..()
 
 
 /*

code/game/machinery/telecomms/telecomunications.dm

@@ -160,9 +160,9 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 				add_link(T)
 
 
-/obj/machinery/telecomms/Del()
+/obj/machinery/telecomms/Destroy()
 	telecomms_list -= src
-	..()
+	return ..()
 
 // Used in auto linking
 /obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T)

code/game/machinery/turret_control.dm

@@ -37,12 +37,12 @@
 	lethal = 1
 	icon_state = "control_kill"
 
-/obj/machinery/turretid/Del()
+/obj/machinery/turretid/Destroy()
 	if(control_area)
 		var/area/A = control_area
 		if(A && istype(A))
 			A.turret_controls -= src
-	..()
+	return ..()
 
 /obj/machinery/turretid/initialize()
 	if(!control_area)

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -21,10 +21,10 @@ var/global/list/image/splatter_cache=list()
 	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
 
-/obj/effect/decal/cleanable/blood/Del()
+/obj/effect/decal/cleanable/blood/Destroy()
 	for(var/datum/disease2/disease/D in viruses)
 		D.cure(0)
-	..()
+	return ..()
 
 /obj/effect/decal/cleanable/blood/New()
 	..()

code/game/objects/items/devices/PDA/PDA.dm

@@ -812,73 +812,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	return 1 // return 1 tells it to refresh the UI in NanoUI
 
-
-/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P)
-	//TODO: sometimes these attacks show up on the message server
-	var/i = rand(1,100)
-	var/j = rand(0,1) //Possibility of losing the PDA after the detonation
-	var/message = ""
-	var/mob/living/M = null
-	if(ismob(P.loc))
-		M = P.loc
-
-	//switch(i) //Yes, the overlapping cases are intended.
-	if(i<=10) //The traditional explosion
-		P.explode()
-		j=1
-		message += "Your [P] suddenly explodes!"
-	if(i>=10 && i<= 20) //The PDA burns a hole in the holder.
-		j=1
-		if(M && isliving(M))
-			M.apply_damage( rand(30,60) , BURN)
-		message += "You feel a searing heat! Your [P] is burning!"
-	if(i>=20 && i<=25) //EMP
-		empulse(P.loc, 3, 6, 1)
-		message += "Your [P] emits a wave of electromagnetic energy!"
-	if(i>=25 && i<=40) //Smoke
-		var/datum/effect/effect/system/harmless_smoke_spread/S = new /datum/effect/effect/system/harmless_smoke_spread //Why was this chem_smoke_spread when there are no chems involved?
-		S.attach(P.loc)
-		S.set_up(P, 10, 0, P.loc)
-		playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
-		S.start()
-		message += "Large clouds of smoke billow forth from your [P]!"
-	if(i>=40 && i<=45) //Bad smoke
-		var/datum/effect/effect/system/bad_smoke_spread/B = new /datum/effect/effect/system/bad_smoke_spread
-		B.attach(P.loc)
-		B.set_up(P, 10, 0, P.loc)
-		playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
-		B.start()
-		message += "Large clouds of noxious smoke billow forth from your [P]!"
-	if(i>=65 && i<=75) //Weaken
-		if(M && isliving(M))
-			M.apply_effects(0,1)
-		message += "Your [P] flashes with a blinding white light! You feel weaker."
-	if(i>=75 && i<=85) //Stun and stutter
-		if(M && isliving(M))
-			M.apply_effects(1,0,0,0,1)
-		message += "Your [P] flashes with a blinding white light! You feel weaker."
-	if(i>=85) //Sparks
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-		s.set_up(2, 1, P.loc)
-		s.start()
-		message += "Your [P] begins to spark violently!"
-	if(i>45 && i<65 && prob(50)) //Nothing happens
-		message += "Your [P] bleeps loudly."
-		j = prob(10)
-
-	if(j) //This kills the PDA
-		P.Del()
-		if(message)
-			message += "It melts in a puddle of plastic."
-		else
-			message += "Your [P] shatters in a thousand pieces!"
-
-	JFLOG("[M]'s PDA Detonated >>> [message]")
-
-	if(M && isliving(M))
-		message = "\red" + message
-		M.show_message(message, 1)
-
 /obj/item/device/pda/proc/remove_id()
 	if (id)
 		if (ismob(loc))

code/game/objects/items/devices/multitool.dm

@@ -36,9 +36,9 @@
 	processing_objects += src
 
 
-/obj/item/device/multitool/ai_detect/Del()
+/obj/item/device/multitool/ai_detect/Destroy()
 	processing_objects -= src
-	..()
+	return ..()
 
 /obj/item/device/multitool/ai_detect/process()
 

code/game/objects/items/devices/uplinks.dm

@@ -26,9 +26,9 @@ var/list/world_uplinks = list()
 	welcome = ticker.mode.uplink_welcome
 	uses = ticker.mode.uplink_uses
 
-/obj/item/device/uplink/Del()
+/obj/item/device/uplink/Destroy()
 	world_uplinks-=src
-	..()
+	return ..()
 
 //Let's build a menu!
 /obj/item/device/uplink/proc/generate_menu(mob/user as mob)
@@ -105,7 +105,7 @@ var/list/world_uplinks = list()
 /obj/item/device/uplink/Topic(href, href_list)
 	if(..())
 		return 1
-		
+
 	if(!active)
 		return
 
@@ -252,8 +252,8 @@ var/list/world_uplinks = list()
 			src.hidden_uplink.trigger(user)
 			return 1
 	return 0
-	
-//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it)	
+
+//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it)
 /obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
 		var/obj/item/weapon/antag_spawner/borg_tele/S = W

code/game/objects/structures/inflatable.dm

@@ -30,9 +30,9 @@
 		..()
 		air_update_turf()
 
-	Del()
+	Destroy()
 		air_update_turf()
-		..()
+		return ..()
 
 	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 		return 0

code/game/turfs/simulated/walls.dm

@@ -34,7 +34,9 @@
 
 
 /turf/simulated/wall/Del()
-	for(var/obj/effect/E in src) if(E.name == "Wallrot") del E
+	for(var/obj/effect/E in src)
+		if(E.name == "Wallrot")
+			qdel(E)
 
 /turf/simulated/wall/ChangeTurf(var/newtype)
 	for(var/obj/effect/E in src) if(E.name == "Wallrot") del E