Merge pull request #1480 from Fox-McCloud/qdel-the-dels

The Great Del() Cull of 2015

code/modules/reagents/Chemistry-Holder.dm

@@ -357,7 +357,7 @@ datum
 							var/mob/living/M = my_atom
 							R.reagent_deleted(M)
 						reagent_list -= A
-						del(A)
+						qdel(A)
 						update_total()
 						my_atom.on_reagent_change()
 						check_ignoreslow(my_atom)

code/modules/reagents/Chemistry-Machinery.dm

@@ -95,7 +95,7 @@
 
 /obj/machinery/chem_dispenser/blob_act()
 	if (prob(50))
-		del(src)
+		qdel(src)
 
  /**
   * The ui_interact proc is used to open and update Nano UIs
@@ -209,7 +209,7 @@
 			S.use(1)
 		else
 			user.drop_item()
-			del(B)
+			qdel(B)
 		return
 
 	if(src.beaker)
@@ -970,7 +970,7 @@
 
 /obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O)
 	holdingitems -= O
-	del(O)
+	qdel(O)
 
 /obj/machinery/reagentgrinder/proc/juice()
 	power_change()

code/modules/reagents/Chemistry-Reagents.dm

@@ -428,7 +428,7 @@ datum
 					M.invisibility = 101
 					for(var/obj/item/W in M)
 						if(istype(W, /obj/item/weapon/implant))	//TODO: Carn. give implants a dropped() or something
-							del(W)
+							qdel(W)
 							continue
 						W.layer = initial(W.layer)
 						W.loc = M.loc
@@ -440,7 +440,7 @@ datum
 						M.mind.transfer_to(new_mob)
 					else
 						new_mob.key = M.key
-					del(M)
+					qdel(M)
 				..()
 				return
 
@@ -834,7 +834,7 @@ datum
 						I.desc = "Looks like this was \an [O] some time ago."
 						for(var/mob/M in viewers(5, O))
 							M << "\red \the [O] melts."
-						del(O)
+						qdel(O)
 
 		glycerol
 			name = "Glycerol"
@@ -1118,7 +1118,7 @@ datum
 
 			reaction_obj(var/obj/O, var/volume)
 				if(istype(O,/obj/effect/decal/cleanable))
-					del(O)
+					qdel(O)
 				else
 					if(O)
 						O.clean_blood()
@@ -1127,7 +1127,7 @@ datum
 					T.overlays.Cut()
 					T.clean_blood()
 					for(var/obj/effect/decal/cleanable/C in src)
-						del(C)
+						qdel(C)
 
 					for(var/mob/living/carbon/slime/M in T)
 						M.adjustToxLoss(rand(5,10))

code/modules/reagents/dartgun.dm

@@ -155,7 +155,7 @@
 		cartridge.darts--
 		src.update_icon()
 		S.reagents.trans_to(D, S.reagents.total_volume)
-		del(S)
+		qdel(S)
 		D.icon_state = "syringeproj"
 		D.name = "syringe"
 		D.flags |= NOREACT
@@ -194,16 +194,16 @@
 						D.reagents.trans_to(M, 15)
 					M << "<span class='danger'>You feel a slight prick.</span>"
 
-					del(D)
+					qdel(D)
 					break
 			if(D)
 				for(var/atom/A in D.loc)
 					if(A == user) continue
-					if(A.density) del(D)
+					if(A.density) qdel(D)
 
 			sleep(1)
 
-		if (D) spawn(10) del(D)
+		if (D) spawn(10) qdel(D)
 
 		return
 

code/modules/reagents/newchem/toxins.dm

@@ -249,7 +249,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 				if(method == TOUCH)
 					if(H.wear_mask)
 						if(!H.wear_mask.unacidable)
-							qdel (H.wear_mask)
+							qdel(H.wear_mask)
 							H.update_inv_wear_mask()
 							H << "\red Your mask melts away but protects you from the acid!"
 						else
@@ -574,7 +574,9 @@ datum/reagent/atrazine/reaction_turf(var/turf/T, var/volume)
 		var/turf/simulated/wall/W = T
 		if(W.rotting)
 			W.rotting = 0
-			for(var/obj/effect/E in W) if(E.name == "Wallrot") del E
+			for(var/obj/effect/E in W)
+				if(E.name == "Wallrot")
+					qdel(E)
 
 			for(var/mob/O in viewers(W, null))
 				O.show_message(text("\blue The fungi are completely dissolved by the solution!"), 1)
@@ -585,9 +587,9 @@ datum/reagent/atrazine/reaction_obj(var/obj/O, var/volume)
 		alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 		alien_weeds.healthcheck()
 	else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
-		del(O)
+		qdel(O)
 	else if(istype(O,/obj/effect/plant))
-		if(prob(50)) del(O) //Kills kudzu too.
+		if(prob(50)) qdel(O) //Kills kudzu too.
 	// Damage that is done to growing plants is separately at code/game/machinery/hydroponics at obj/item/hydroponics
 
 datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -30,7 +30,7 @@
 	user.put_in_active_hand(B)
 	src.transfer_fingerprints_to(B)
 
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob)
 

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -19,7 +19,7 @@
 		user.put_in_active_hand(S)
 		src.transfer_fingerprints_to(S)
 
-		del(src)
+		qdel(src)
 
 
 	attack(mob/living/target as mob, mob/living/user as mob)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -30,7 +30,7 @@
 				usr.put_in_hands(TrashItem)
 			else if(istype(trash,/obj/item))
 				usr.put_in_hands(trash)
-		del(src)
+		qdel(src)
 	return
 
 /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob)
@@ -40,7 +40,7 @@
 	if(!reagents.total_volume)						//Shouldn't be needed but it checks to see if it has anything left in it.
 		user << "\red None of [src] left, oh no!"
 		M.unEquip(src)	//so icons update :[
-		del(src)
+		qdel(src)
 		return 0
 
 	if(istype(M, /mob/living/carbon))
@@ -169,7 +169,7 @@
 		reagents.trans_to(U,min(reagents.total_volume,5))
 
 		if (reagents.total_volume <= 0)
-			del(src)
+			qdel(src)
 		return
 
 	if((slices_num <= 0 || !slices_num) || !slice_path)
@@ -227,7 +227,7 @@
 	for(var/i=1 to (slices_num-slices_lost))
 		var/obj/slice = new slice_path (src.loc)
 		reagents.trans_to(slice,reagents_per_slice)
-	del(src)
+	qdel(src)
 
 	return
 
@@ -246,7 +246,7 @@
 				playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
 				var/mob/living/simple_animal/pet/corgi/C = M
 				C.health = min(C.health + 5, C.maxHealth)
-				del(src)
+				qdel(src)
 			else
 				M.visible_message("[M] takes a bite of \the [src].","<span class=\"notice\">You take a bite of \the [src].")
 				playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -541,7 +541,7 @@
 		new/obj/effect/decal/cleanable/egg_smudge(src.loc)
 		src.reagents.reaction(hit_atom, TOUCH)
 		src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
-		del(src)
+		qdel(src)
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype( W, /obj/item/toy/crayon ))
@@ -1019,7 +1019,7 @@
 	..()
 	new/obj/effect/decal/cleanable/pie_smudge(src.loc)
 	src.visible_message("\red [src.name] splats.","\red You hear a splat.")
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
 	name = "Berry Clafoutis"
@@ -1731,7 +1731,7 @@
 			M << "\red \The [src] expands!"
 		var/mob/living/carbon/human/H = new (src)
 		H.set_species(monkey_type)
-		del(src)
+		qdel(src)
 
 	proc/Unwrap(mob/user as mob)
 		icon_state = "monkeycube"
@@ -2308,7 +2308,7 @@
 				"\blue You flatten the dough with your rolling pin!" \
 				)
 			new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src.loc)
-			del(src)
+			qdel(src)
 
 /////////////////////////////////////////////////Sliceable////////////////////////////////////////
 // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -3253,16 +3253,16 @@
 	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
 		new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
 		user << "You make some dough."
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 
 // Egg + flour = dough
 /obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour))
 		new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
 		user << "You make some dough."
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/dough
 	name = "dough"
@@ -3382,7 +3382,7 @@
 	if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
 		new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
 		user << "You cut the potato."
-		del(src)
+		qdel(src)
 	else
 		..()
 

code/modules/reagents/reagent_containers/food/snacks/meat.dm

@@ -15,7 +15,7 @@
 		new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
 		user << "You cut the meat in thin strips."
-		del(src)
+		qdel(src)
 	else
 		..()
 

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -346,7 +346,7 @@
 	attackby(var/obj/D, mob/user as mob, params)
 		if(isprox(D))
 			user << "You add [D] to [src]."
-			del(D)
+			qdel(D)
 			user.put_in_hands(new /obj/item/weapon/bucket_sensor)
 			user.unEquip(src)
 			qdel(src)

code/modules/reagents/reagent_containers/spray.dm

@@ -71,7 +71,7 @@
 			for(var/atom/T in get_turf(D))
 				D.reagents.reaction(T)
 			sleep(3)
-		del(D)
+		qdel(D)
 
 
 /obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user)
@@ -200,7 +200,7 @@
 				for(var/atom/t in get_turf(D))
 					D.reagents.reaction(t)
 				sleep(2)
-			del(D)
+			qdel(D)
 
 
 

code/modules/reagents/reagent_containers/syringes.dm

@@ -305,7 +305,7 @@
 				for(var/mob/O in viewers(world.view, user))
 					O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
 				user.unEquip(src)
-				del(src)
+				qdel(src)
 				return
 
 			for(var/mob/O in viewers(world.view, user))

code/modules/reagents/syringe_gun.dm

@@ -25,7 +25,7 @@
 	in_chamber.name = S.name
 	syringes.Remove(S)
 
-	del(S)
+	qdel(S)
 	return 1
 
 /obj/item/weapon/gun/syringe/examine()