Fix non-icon merge conflicts

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

@@ -4,4 +4,4 @@
 	..()
 	spawn(0)
 		if(src && !key)	//we've transferred to another mob. This ghost should be deleted.
-			del(src)
+			qdel(src)

code/modules/mob/death.dm

@@ -21,8 +21,8 @@
 	if(client)
 		respawnable_list += src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 
 //This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
@@ -48,8 +48,8 @@
 	if(client)
 		respawnable_list += src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/proc/melt()
 	death(1)
@@ -71,8 +71,8 @@
 	if(client)
 		respawnable_list += src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/proc/death(gibbed)
 

code/modules/mob/inventory.dm

@@ -258,6 +258,6 @@
 			W.loc = src
 	else
 		if (del_on_fail)
-			del(W)
+			qdel(W)
 	return equipped
 

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

@@ -266,7 +266,7 @@ Des: Removes all infected images from the alien.
 	if (client)
 		for(var/image/I in client.images)
 			if(dd_hasprefix_case(I.icon_state, "infected"))
-				del(I)
+				qdel(I)
 	return
 
 /mob/living/carbon/alien/canBeHandcuffed()

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

@@ -16,8 +16,8 @@
 	dead_mob_list -= src
 
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/carbon/alien/dust()
 	death(1)
@@ -37,8 +37,8 @@
 	dead_mob_list -= src
 
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/carbon/alien/death(gibbed)
 	if(stat == DEAD)	return

code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm

@@ -42,7 +42,7 @@
 			var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc)
 			mind.transfer_to(new_xeno)
 			new_xeno.mind.name = new_xeno.name
-			del(src)
+			qdel(src)
 		else
 			src << "<span class='notice'>We already have an alive queen.</span>"
 	return

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -157,7 +157,7 @@
 	if (targeted_by && target_locked)
 		overlays_standing[TARGETED_LAYER]	= target_locked
 	else if (!targeted_by && target_locked)
-		del(target_locked)
+		qdel(target_locked)
 	if (!targeted_by)
 		overlays_standing[TARGETED_LAYER]	= null
 	if(update_icons)		update_icons()

code/modules/mob/living/carbon/alien/larva/powers.dm

@@ -53,7 +53,7 @@
 		else
 			new_xeno.key = key
 		new_xeno.mind.name = new_xeno.name
-		del(src)
+		qdel(src)
 		return
 	else
 		src << "<span class='warning'>You are not fully grown.</span>"

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -137,4 +137,4 @@ Des: Removes all images from the mob infected by this embryo
 		if(alien.client)
 			for(var/image/I in alien.client.images)
 				if(dd_hasprefix_case(I.icon_state, "infected") && I.loc == affected_mob)
-					del(I)
+					qdel(I)

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

@@ -50,7 +50,7 @@
 				name = "Man-Machine Interface: [brainmob.real_name]"
 				icon_state = "mmi_full"
 				alien = 0
-			del(O)
+			qdel(O)
 
 
 			locked = 1

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

@@ -34,10 +34,10 @@
 
 	dead_mob_list -= src
 	if(container && istype(container, /obj/item/device/mmi))
-		del(container)//Gets rid of the MMI if there is one
+		qdel(container)//Gets rid of the MMI if there is one
 	if(loc)
 		if(istype(loc,/obj/item/organ/brain))
 			del(loc)//Gets rid of the brain item
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)

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

@@ -37,8 +37,8 @@
 		s.start()
 
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/carbon/human/dust()
 	death(1)
@@ -57,8 +57,8 @@
 	new /obj/effect/decal/remains/human(loc)
 
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/carbon/human/melt()
 	death(1)
@@ -77,8 +77,8 @@
 	//new /obj/effect/decal/remains/human(loc)
 
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/carbon/human/death(gibbed)
 	if(stat == DEAD)	return

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

@@ -246,7 +246,7 @@
 	if (client.statpanel == "Status")
 		if (internal)
 			if (!internal.air_contents)
-				del(internal)
+				qdel(internal)
 			else
 				stat("Internal Atmosphere Info", internal.name)
 				stat("Tank Pressure", internal.air_contents.return_pressure())
@@ -1205,7 +1205,7 @@
 				if(H.brainmob.real_name == src.real_name)
 					if(H.brainmob.mind)
 						H.brainmob.mind.transfer_to(src)
-						del(H)
+						qdel(H)
 
 
 
@@ -1279,7 +1279,7 @@
 	.=..()
 	if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
 		feet_blood_color = null
-		del(feet_blood_DNA)
+		qdel(feet_blood_DNA)
 		update_inv_shoes(1)
 		return 1
 

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

@@ -206,14 +206,14 @@
 							visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
 							talked = 1
 						spawn(1)
-							del(lgrab)
+							qdel(lgrab)
 					if(istype(r_hand, /obj/item/weapon/grab))
 						var/obj/item/weapon/grab/rgrab = r_hand
 						if(rgrab.affecting)
 							visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
 							talked = 1
 						spawn(1)
-							del(rgrab)
+							qdel(rgrab)
 					//End BubbleWrap
 
 					if(!talked)	//BubbleWrap

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

@@ -247,7 +247,7 @@ emp_act
 			else
 				LAssailant = user
 
-			del(src)
+			qdel(src)
 
 	var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
 	if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED))

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

@@ -139,7 +139,7 @@
 			spark_system.attach(src)
 			spark_system.start()
 			spawn(10)
-				del(spark_system)
+				qdel(spark_system)
 
 //Handles chem traces
 /mob/living/carbon/human/proc/handle_trace_chems()

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

@@ -42,7 +42,7 @@
 		if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
 			return slot
 	if (del_on_fail)
-		del(W)
+		qdel(W)
 	return null
 
 /mob/living/carbon/human/proc/is_in_hands(var/typepath)
@@ -353,9 +353,9 @@
 
 /obj/effect/equip_e/New()
 	if (!ticker)
-		del(src)
+		qdel(src)
 	spawn(100)
-		del(src)
+		qdel(src)
 	..()
 	return
 
@@ -366,22 +366,22 @@
 		switch(place)
 			if("mask")
 				if (!( target.wear_mask ))
-					del(src)
+					qdel(src)
 			if("l_hand")
 				if (!( target.l_hand ))
-					del(src)
+					qdel(src)
 			if("r_hand")
 				if (!( target.r_hand ))
-					del(src)
+					qdel(src)
 			if("suit")
 				if (!( target.wear_suit ))
-					del(src)
+					qdel(src)
 			if("uniform")
 				if (!( target.w_uniform ))
-					del(src)
+					qdel(src)
 			if("back")
 				if (!( target.back ))
-					del(src)
+					qdel(src)
 			if("syringe")
 				return
 			if("pill")
@@ -394,10 +394,10 @@
 				return
 			if("handcuff")
 				if (!( target.handcuffed ))
-					del(src)
+					qdel(src)
 			if("id")
 				if ((!( target.wear_id ) || !( target.w_uniform )))
-					del(src)
+					qdel(src)
 			if("splints")
 				var/count = 0
 				for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
@@ -406,11 +406,11 @@
 						count = 1
 						break
 				if(count == 0)
-					del(src)
+					qdel(src)
 					return
 			if("internal")
 				if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && (istype(target.back, /obj/item/weapon/tank) || istype(target.belt, /obj/item/weapon/tank) || istype(target.s_store, /obj/item/weapon/tank)) && !( target.internal )) ) && !( target.internal )))
-					del(src)
+					qdel(src)
 
 	var/message=null
 	if(target.frozen)
@@ -557,7 +557,7 @@
 			message = "\red <B>[source] is trying to empty [target]'s pockets!</B>"
 		if("CPR")
 			if (!target.cpr_time)
-				del(src)
+				qdel(src)
 			target.cpr_time = 0
 			message = "\red <B>[source] is trying perform CPR on [target]!</B>"
 		if("id")
@@ -668,13 +668,13 @@ It can still be worn/put on as normal.
 				strip_item = target.shoes
 		if("l_hand")
 			if (istype(target, /obj/item/clothing/suit/straight_jacket))
-				del(src)
+				qdel(src)
 			slot_to_process = slot_l_hand
 			if (target.l_hand)
 				strip_item = target.l_hand
 		if("r_hand")
 			if (istype(target, /obj/item/clothing/suit/straight_jacket))
-				del(src)
+				qdel(src)
 			slot_to_process = slot_r_hand
 			if (target.r_hand)
 				strip_item = target.r_hand
@@ -746,11 +746,11 @@ It can still be worn/put on as normal.
 				S.add_fingerprint(source)
 				if (!( istype(S, /obj/item/weapon/dnainjector) ))
 					S.inuse = 0
-					del(src)
+					qdel(src)
 				S.inject(target, source)
 				if (S.s_time >= world.time + 30)
 					S.inuse = 0
-					del(src)
+					qdel(src)
 				S.s_time = world.time
 				for(var/mob/O in viewers(source, null))
 					O.show_message("\red [source] injects [target] with the DNA Injector!", 1)
@@ -815,7 +815,7 @@ It can still be worn/put on as normal.
 	if(source && target)
 		if(source.machine == target)
 			target.show_inv(source)
-	del(src)
+	qdel(src)
 
 
 /mob/proc/get_item_by_slot(slot_id)

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

@@ -1471,7 +1471,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					if(M.stat == 2)
 						M.death(1)
 						stomach_contents.Remove(M)
-						del(M)
+						qdel(M)
 						continue
 					if(mob_master.current_cycle%3==1)
 						if(!(M.status_flags & GODMODE))

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

@@ -60,7 +60,7 @@
 			H << "<span class='danger'><B>[M] grips your antennae and starts violently pulling!<B></span>"
 			do_after(H, 250)
 			if(p_loc == M.loc && p_loc_m == H.loc)
-				del(H.internal_organs_by_name["antennae"])
+				qdel(H.internal_organs_by_name["antennae"])
 				H.remove_language("Wryn Hivemind")
 				new /obj/item/organ/wryn/hivenode(M.loc)
 				M << "<span class='notice'>You hear a loud crunch as you mercilessly pull off [H]'s antennae.</span>"
@@ -110,4 +110,4 @@
 	H.visible_message("\red[H]'s body explodes, leaving behind a pile of microscopic crystals!")
 	explosion(T, 0, 0, 2, 2) // Create a small explosion burst upon death
 //	new /obj/item/weapon/shard/supermatter( T )
-	del(H)
+	qdel(H)

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

@@ -122,7 +122,7 @@
 
 	for(var/obj/item/organ/organ in H.contents)
 		if((organ in H.organs) || (organ in H.internal_organs))
-			del(organ)
+			qdel(organ)
 
 	if(H.organs)                  H.organs.Cut()
 	if(H.internal_organs)         H.internal_organs.Cut()

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

@@ -133,7 +133,7 @@
 	//now mobs
 	var/speech_bubble_test = say_test(message)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
-	spawn(30) del(speech_bubble)
+	spawn(30) qdel(speech_bubble)
 
 	for(var/mob/M in listening)
 		M << speech_bubble

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

@@ -638,7 +638,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 			user <<"You apply the enhancer. It now has triple the amount of uses."
 			Uses = 3
 			enhanced = 1
-			del(O)
+			qdel(O)
 
 /obj/item/slime_extract/New()
 		..()
@@ -777,14 +777,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		pet.icon_dead = "[M.colour] baby slime dead"
 		pet.colour = "[M.colour]"
 		user <<"You feed the slime the potion, removing it's powers and calming it."
-		del(M)
+		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
 		if (!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/slimepotion2
 	name = "advanced docility potion"
@@ -808,14 +808,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		pet.icon_dead = "[M.colour] baby slime dead"
 		pet.colour = "[M.colour]"
 		user <<"You feed the slime the potion, removing it's powers and calming it."
-		del(M)
+		qdel(M)
 		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
 		if (!newname)
 			newname = "pet slime"
 		pet.name = newname
 		pet.real_name = newname
-		del(src)
+		qdel(src)
 
 
 /obj/item/weapon/slimesteroid
@@ -840,7 +840,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 		user <<"You feed the slime the steroid. It now has triple the amount of extract."
 		M.cores = 3
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/slimesteroid2
 	name = "extract enhancer"
@@ -885,7 +885,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		G.loc = src.loc
 		G.key = ghost.key
 		G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
-		del (src)
+		qdel(src)
 
 
 	proc/announce_to_ghosts()

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

@@ -221,7 +221,7 @@
 				src.mind.transfer_to(new_slime)
 			else
 				new_slime.key = src.key
-			del(src)
+			qdel(src)
 		else
 			src << "<i>I am not ready to reproduce yet...</i>"
 	else

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

@@ -167,7 +167,7 @@
 	if(istype(loc,/obj/item/weapon/holder/diona))
 		var/obj/item/weapon/holder/diona/L = loc
 		src.loc = L.loc
-		del(L)
+		qdel(L)
 
 	for(var/datum/language/L in languages)
 		adult.add_language(L.name)
@@ -182,7 +182,7 @@
 	for (var/obj/item/W in src.contents)
 		src.unEquip(W)
 
-	del(src)
+	qdel(src)
 
 /mob/living/carbon/primitive/diona/verb/steal_blood()
 	set category = "Diona"

code/modules/mob/living/living.dm

@@ -423,7 +423,7 @@
 								for(var/mob/O in viewers(M, null))
 									O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
 								//G = null
-								del(G)
+								qdel(G)
 						else
 							ok = 0
 						if (locate(/obj/item/weapon/grab, M.grabbed_by.len))
@@ -565,7 +565,7 @@
 
 	for(var/obj/O in L.requests)
 		L.requests.Remove(O)
-		del(O)
+		qdel(O)
 		resisting++
 
 	for(var/obj/item/weapon/grab/G in usr.grabbed_by)
@@ -739,7 +739,7 @@
 
 			if(hulklien)
 				CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-				del(CM.handcuffed)
+				qdel(CM.handcuffed)
 				CM.handcuffed = null
 				CM.update_inv_handcuffed()
 				return

code/modules/mob/living/say.dm

@@ -122,7 +122,7 @@ proc/get_radio_key_from_channel(var/channel)
 
 	var/speech_bubble_test = say_test(message)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
-	spawn(30) del(speech_bubble)
+	spawn(30) qdel(speech_bubble)
 
 	for(var/mob/M in listening)
 		M << speech_bubble

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

@@ -882,7 +882,7 @@ var/list/ai_verbs_default = list(
 			input = input("Select a crew member:") as null|anything in personnel_list
 			var/icon/character_icon = personnel_list[input]
 			if(character_icon)
-				del(holo_icon)//Clear old icon so we're not storing it in memory.
+				qdel(holo_icon)//Clear old icon so we're not storing it in memory.
 				holo_icon = getHologramIcon(icon(character_icon))
 		else
 			alert("No suitable records found. Aborting.")
@@ -895,7 +895,7 @@ var/list/ai_verbs_default = list(
 		)
 		input = input("Please select a hologram:") as null|anything in icon_list
 		if(input)
-			del(holo_icon)
+			qdel(holo_icon)
 			switch(input)
 				if("default")
 					holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))

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

@@ -16,8 +16,8 @@
 
 	dead_mob_list -= src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/silicon/dust()
 	death(1)
@@ -37,5 +37,5 @@
 
 	dead_mob_list -= src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)

code/modules/mob/living/silicon/pai/life.dm

@@ -6,7 +6,7 @@
 			var/turf/T = get_turf_or_move(src.loc)
 			for (var/mob/M in viewers(T))
 				M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
-			del(src.cable)
+			qdel(src.cable)
 	sleeping = 0
 	ear_deaf = 0
 

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

@@ -17,8 +17,8 @@
 	living_mob_list -= src
 	dead_mob_list -= src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 /mob/living/silicon/robot/dust()
 	death(1)
@@ -35,12 +35,12 @@
 
 	flick("dust-r", animation)
 	new /obj/effect/decal/remains/robot(loc)
-	if(mmi)		del(mmi)	//Delete the MMI first so that it won't go popping out.
+	if(mmi)		qdel(mmi)	//Delete the MMI first so that it won't go popping out.
 
 	dead_mob_list -= src
 	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+		if(animation)	qdel(animation)
+		if(src)			qdel(src)
 
 
 /mob/living/silicon/robot/death(gibbed)

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

@@ -176,7 +176,7 @@
 		if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse))
 			src.loc.visible_message("\red [src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","\red It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")
 			new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-			del(M)
+			qdel(M)
 			stored_comms["wood"]++
 			stored_comms["wood"]++
 			stored_comms["plastic"]++
@@ -200,7 +200,7 @@
 
 			D << "\red You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself."
 
-			del(M)
+			qdel(M)
 			new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
 
 			stored_comms["metal"] += 15
@@ -267,7 +267,7 @@
 		else
 			continue
 
-		del(W)
+		qdel(W)
 		grabbed_something = 1
 
 	if(grabbed_something)

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

@@ -703,7 +703,7 @@ var/list/robot_verbs_default = list(
 					// This doesn't work.  Don't use it.
 					//src.Destroy()
 					// del() because it's infrequent and mobs act weird in qdel.
-					del(src)
+					qdel(src)
 			else
 				// Okay we're not removing the cell or an MMI, but maybe something else?
 				var/list/removable_components = list()
@@ -865,7 +865,7 @@ var/list/robot_verbs_default = list(
 			src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands."
 			if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
 				for(var/obj/item/weapon/pickaxe/drill/cyborg/D in src.module.modules)
-					del(D)
+					qdel(D)
 				src.module.modules += new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src.module)
 				src.module.rebuild()
 			if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
@@ -1067,7 +1067,7 @@ var/list/robot_verbs_default = list(
 //Call when target overlay should be added/removed
 /mob/living/silicon/robot/update_targeted()
 	if(!targeted_by && target_locked)
-		del(target_locked)
+		qdel(target_locked)
 	updateicon()
 	if (targeted_by && target_locked)
 		overlays += target_locked
@@ -1205,7 +1205,7 @@ var/list/robot_verbs_default = list(
 				for(var/A in tile)
 					if(istype(A, /obj/effect))
 						if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
-							del(A)
+							qdel(A)
 					else if(istype(A, /obj/item))
 						var/obj/item/cleaned_item = A
 						cleaned_item.clean_blood()

code/modules/mob/living/simple_animal/bees.dm

@@ -117,7 +117,7 @@
 
 			if(feral > 0)
 				src.strength += B.strength
-				del(B)
+				qdel(B)
 				src.icon_state = "bees[src.strength]"
 				if(strength > 5)
 					icon_state = "bees_swarm"
@@ -130,7 +130,7 @@
 
 					B.icon_state = "bees[B.strength]"
 					if(src.strength <= 0)
-						del(src)
+						qdel(src)
 						return
 					src.icon_state = "bees[B.strength]"
 					var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
@@ -179,7 +179,7 @@
 	if(!parent && prob(10))
 		strength -= 1
 		if(strength <= 0)
-			del(src)
+			qdel(src)
 		else if(strength <= 5)
 			icon_state = "bees[strength]"
 

code/modules/mob/living/simple_animal/borer.dm

@@ -204,7 +204,7 @@
 			host.computer_id = null
 			host.lastKnownIP = null
 
-			del(host_brain)
+			qdel(host_brain)
 			host_brain = new(src)
 
 			host_brain.ckey = host.ckey
@@ -352,7 +352,7 @@ mob/living/simple_animal/borer/proc/detatch()
 		if(!host.lastKnownIP)
 			host.lastKnownIP = b2h_ip
 
-	del(host_brain)
+	qdel(host_brain)
 
 	return
 

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -668,5 +668,5 @@
 	s.set_up(3, 1, src)
 	s.start()
 	respawnable_list += src
-	del src
+	qdel(src)
 	return

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -47,7 +47,7 @@
 
 		if(locate(/obj/effect/plant) in loc)
 			var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
-			del(SV)
+			qdel(SV)
 			if(prob(10))
 				say("Nom")
 
@@ -67,7 +67,7 @@
 	if(!stat)
 		if(locate(/obj/effect/plant) in loc)
 			var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
-			del(SV)
+			qdel(SV)
 			if(prob(10))
 				say("Nom")
 
@@ -245,7 +245,7 @@ var/global/chicken_count = 0
 			if(!stat && eggsleft < 8)
 				user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
 				user.drop_item()
-				del(O)
+				qdel(O)
 				eggsleft += rand(1, 4)
 				//world << eggsleft
 			else
@@ -276,7 +276,7 @@ var/global/chicken_count = 0
 			visible_message("[src] hatches with a quiet cracking sound.")
 			new /mob/living/simple_animal/chick(get_turf(src))
 			processing_objects.Remove(src)
-			del(src)
+			qdel(src)
 	else
 		processing_objects.Remove(src)
 

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -81,4 +81,4 @@
 	S2.icon_living = "[src.colour] baby slime"
 	S2.icon_dead = "[src.colour] baby slime dead"
 	S2.colour = "[src.colour]"
-	del(src)
+	qdel(src)

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -100,7 +100,7 @@
 				if("rapid")
 					new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
 		spawn(100)
-			del(src)
+			qdel(src)
 		return
 
 

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -159,7 +159,7 @@
 /mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
 	src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
 	..()
-	del(src)
+	qdel(src)
 
 /mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
 	//some random debris left behind

code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm

@@ -69,7 +69,7 @@
 	..()
 /mob/living/simple_animal/hostile/retaliate/ghost/Die()
 	new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm(loc)
-	del src
+	qdel(src)
 	return
 
 /mob/living/simple_animal/hostile/retaliate/skeleton
@@ -107,7 +107,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/skeleton/Die()
 	new /obj/effect/decal/remains/human(loc)
-	del src
+	qdel(src)
 	return
 
 /mob/living/simple_animal/hostile/retaliate/zombie
@@ -145,5 +145,5 @@
 
 /mob/living/simple_animal/hostile/retaliate/zombie/Die()
 	new /obj/effect/decal/cleanable/blood/gibs(loc)
-	del src
+	qdel(src)
 	return

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -57,5 +57,5 @@
 		new corpse (src.loc)
 	if(weapon1)
 		new weapon1 (src.loc)
-	del src
+	qdel(src)
 	return

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -42,7 +42,7 @@
 		new weapon1 (src.loc)
 	if(weapon2)
 		new weapon2 (src.loc)
-	del src
+	qdel(src)
 	return
 
 ///////////////Sword and shield////////////
@@ -165,5 +165,5 @@
 /mob/living/simple_animal/hostile/viscerator/Die()
 	..()
 	visible_message("\red <b>[src]</b> is smashed into pieces!")
-	del src
+	qdel(src)
 	return

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -54,4 +54,4 @@
 	..()
 	visible_message("\red <b>[src]</b> is hacked into pieces!")
 	new /obj/item/stack/sheet/wood(loc)
-	del(src)
+	qdel(src)

code/modules/mob/living/simple_animal/shade.dm

@@ -36,7 +36,7 @@
 				if((M.client && !( M.blinded )))
 					M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
 					ghostize()
-			del src
+			qdel(src)
 			return
 
 

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -399,7 +399,7 @@
 						adjustBruteLoss(-MED.heal_brute)
 						MED.amount -= 1
 						if(MED.amount <= 0)
-							del(MED)
+							qdel(MED)
 						for(var/mob/M in viewers(src, null))
 							if ((M.client && !( M.blinded )))
 								M.show_message("\blue [user] applies [MED] on [src]")

code/modules/mob/living/simple_animal/tribbles.dm

@@ -49,7 +49,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 			T.gestation = src.gestation
 			T.pickup(user)
 			user.put_in_active_hand(T)
-			del(src)
+			qdel(src)
 
 
 /mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
@@ -109,7 +109,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 		T.gestation = src.gestation
 
 	user << "<span class='notice'>The tribble gets up and wanders around.</span>"
-	del(src)
+	qdel(src)
 
 /obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering
 	..()
@@ -162,7 +162,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 	if (prob(75))
 		new /obj/item/weapon/shard( src.loc )
 		Break()
-		del(src)
+		qdel(src)
 
 
 /obj/structure/tribble_cage/proc/healthcheck()

code/modules/mob/mob.dm

@@ -168,7 +168,7 @@
 
 	if(!W.mob_can_equip(src, slot, disable_warning))
 		if(del_on_fail)
-			del(W)
+			qdel(W)
 		else
 			if(!disable_warning)
 				src << "\red You are unable to equip that." //Only print if del_on_fail is false
@@ -510,7 +510,7 @@ var/list/slot_equipment_priority = list( \
 				var/list/temp = list(  )
 				temp += L.container
 				//L = null
-				del(L)
+				qdel(L)
 				return temp
 			else
 				return L.container

code/modules/mob/mob_movement.dm

@@ -374,17 +374,17 @@
 			var/obj/item/weapon/grab/G = mob.r_hand
 			grabbing += G.affecting
 		for(var/obj/item/weapon/grab/G in mob.grabbed_by)
-			if((G.state == 1)&&(!grabbing.Find(G.assailant)))	del(G)
+			if((G.state == 1)&&(!grabbing.Find(G.assailant)))	qdel(G)
 			if(G.state == 2)
 				move_delay = world.time + 10
 				if(!prob(25))	return 1
 				mob.visible_message("\red [mob] has broken free of [G.assailant]'s grip!")
-				del(G)
+				qdel(G)
 			if(G.state == 3)
 				move_delay = world.time + 10
 				if(!prob(5))	return 1
 				mob.visible_message("\red [mob] has broken free of [G.assailant]'s headlock!")
-				del(G)
+				qdel(G)
 	return 0
 
 

code/modules/mob/spirit/mask/respawn.dm

@@ -10,9 +10,9 @@
 				ghost.timeofdeath = world.time - 20000
 				ghost.newPlayerType = /mob/new_player/cultist
 				// remove old mask body
-				del(currentSpirit)
+				qdel(currentSpirit)
+
 
-	
 /mob/new_player/cultist/AttemptLateSpawn(rank)
 	var/mob/newCharacter = ..(rank)
 	if(ticker.mode)

code/modules/mob/transform_procs.dm

@@ -65,7 +65,7 @@
 	if (notransform)
 		return
 	for(var/t in organs)
-		del(t)
+		qdel(t)
 
 	return ..(move)
 
@@ -159,7 +159,7 @@
 				"[src] disappears into the shadows, never to be seen again.", \
 				"You disappear into the shadows, never to be seen again.", \
 				"You hear strange noise, you can't quite place it.")
-			del(src)
+			qdel(src)
 
 	new_spirit << "<font color=\"purple\"><b><i>You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.</b></i></font>"
 	new_spirit << "<font color=\"purple\"><b><i>Your job is to help your acolytes complete their goals. Be spooky. Do evil.</b></i></font>"
@@ -188,9 +188,9 @@
 	icon = null
 	invisibility = 101
 	for(var/t in organs)
-		del(t)
+		qdel(t)
 	for(var/i in internal_organs)
-		del(i)
+		qdel(i)
 
 	var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc )
 
@@ -233,7 +233,7 @@
 	O.Namepick()
 
 	spawn(0)//To prevent the proc from returning null.
-		del(src)
+		qdel(src)
 	return O
 
 //human -> alien
@@ -248,7 +248,7 @@
 	icon = null
 	invisibility = 101
 	for(var/t in organs)
-		del(t)
+		qdel(t)
 
 	var/alien_caste = pick("Hunter","Sentinel","Drone")
 	var/mob/living/carbon/alien/humanoid/new_xeno
@@ -266,7 +266,7 @@
 	new_xeno << "<B>You are now an alien.</B>"
 	new_xeno.update_pipe_vision()
 	spawn(0)//To prevent the proc from returning null.
-		del(src)
+		qdel(src)
 	return
 
 /mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
@@ -280,7 +280,7 @@
 	icon = null
 	invisibility = 101
 	for(var/t in organs)
-		del(t)
+		qdel(t)
 
 	var/mob/living/carbon/slime/new_slime
 	if(reproduce)
@@ -302,7 +302,7 @@
 	new_slime << "<B>You are now a slime. Skreee!</B>"
 	new_slime.update_pipe_vision()
 	spawn(0)//To prevent the proc from returning null.
-		del(src)
+		qdel(src)
 	return
 
 /mob/living/carbon/human/proc/corgize()
@@ -316,7 +316,7 @@
 	icon = null
 	invisibility = 101
 	for(var/t in organs)	//this really should not be necessary
-		del(t)
+		qdel(t)
 
 	var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
 	new_corgi.a_intent = "harm"
@@ -325,7 +325,7 @@
 	new_corgi << "<B>You are now a Corgi. Yap Yap!</B>"
 	new_corgi.update_pipe_vision()
 	spawn(0)//To prevent the proc from returning null.
-		del(src)
+		qdel(src)
 	return
 
 /mob/living/carbon/human/Animalize()
@@ -349,7 +349,7 @@
 	invisibility = 101
 
 	for(var/t in organs)
-		del(t)
+		qdel(t)
 
 	var/mob/new_mob = new mobpath(src.loc)
 
@@ -360,7 +360,7 @@
 	new_mob << "You suddenly feel more... animalistic."
 	new_mob.update_pipe_vision()
 	spawn()
-		del(src)
+		qdel(src)
 	return
 
 /mob/proc/Animalize()
@@ -379,7 +379,7 @@
 	new_mob << "You feel more... animalistic"
 	new_mob.update_pipe_vision()
 
-	del(src)
+	qdel(src)
 
 /* Certain mob types have problems and should not be allowed to be controlled by players.
  *