Fix non-icon merge conflicts

code/datums/ai_laws.dm

@@ -165,7 +165,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 	src.ion += law
 
 /datum/ai_laws/proc/clear_inherent_laws()
-	del(src.inherent)
+	qdel(src.inherent)
 	src.inherent = list()
 
 /datum/ai_laws/proc/add_supplied_law(var/number, var/law)
@@ -179,7 +179,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 
 /datum/ai_laws/proc/clear_ion_laws()
 	src.ion = list()
-	
+
 /datum/ai_laws/proc/clear_zeroth_law(var/law_borg = null)
 	src.zeroth = null
 	if(law_borg)

code/datums/cargoprofile.dm

@@ -384,13 +384,13 @@
 		if(istype(W,/obj/item/stack))
 			var/obj/item/stack/I = W
 			if(!I.amount) // todo: am I making a bad assumption here?
-				del I
+				qdel(I)
 				return
 			for(var/obj/item/stack/O in master.contents)
 				if(O.type == I.type && O.amount < O.max_amount)
 					if(I.amount + O.amount <= O.max_amount)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return O.w_class
 					var/leftover = I.amount + O.amount - O.max_amount
 					O.amount = O.max_amount
@@ -403,13 +403,13 @@
 		if(istype(W,/obj/item/stack/cable_coil))
 			var/obj/item/stack/cable_coil/I = W
 			if(!I.amount) // todo: am I making a bad assumption here?
-				del I
+				qdel(I)
 				return
 			for(var/obj/item/stack/cable_coil/O in master.contents)
 				if(O.type == I.type && O.amount < MAXCOIL)
 					if(I.amount + O.amount <= MAXCOIL)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return O.w_class
 					var/leftover = I.amount + O.amount - MAXCOIL
 					O.amount = MAXCOIL
@@ -473,7 +473,7 @@
 				if(O.type == I.type && O.amount < O.max_amount)
 					if(I.amount + O.amount <= O.max_amount)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return
 					var/leftover = I.amount + O.amount - O.max_amount
 					O.amount = O.max_amount
@@ -489,7 +489,7 @@
 					if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define.
 						O.amount += I.amount
 						O.update_icon()
-						del I
+						qdel(I)
 						return
 					var/leftover = I.amount + O.amount - MAXCOIL // That wasn't a question
 					O.amount = MAXCOIL // It was a complaint
@@ -572,13 +572,13 @@
 
 	outlet_reaction(var/atom/W,var/turf/D)
 		if(istype(W,/obj/item/weapon/paper/crumpled))
-			del W
+			qdel(W)
 			return
 		if(istype(W,/obj/item/weapon/clipboard) || istype(W,/obj/item/weapon/folder))
 			// destroy folder, various effects on contents
 			for(var/obj/item/I in W.contents)
 				if(prob(25))//JUNK IT
-					del I
+					qdel(I)
 				else if(prob(50))  //We've been over this.  I can't just take it apart with a crowbar.
 					var/obj/item/weapon/paper/crumpled/P = new(master.loc)
 					if(I.name)
@@ -589,11 +589,11 @@
 					if(istype(I,/obj/item/weapon/paper))
 						var/obj/item/weapon/paper/O = I
 						P.info = garble_keeptags(O.info)
-					del I
+					qdel(I)
 					..(P,D)
 				else
 					..(I,D) // Eject
-			del W //destroy container
+			qdel(W) //destroy container
 			return
 		if(prob(50)) //JUNK IT NOW!
 			var/obj/item/weapon/paper/crumpled/P = new(master.loc)
@@ -612,10 +612,10 @@
 					P.info = garble_keeptags(B.dat)
 				if(B.carved && B.store)
 					..(B.store,D)
-			del W
+			qdel(W)
 			..(P,D)
 		else //I want it junked
-			del W
+			qdel(W)
 		return
 
 /datum/cargoprofile/unary/gibber

code/datums/helper_datums/construction_datum.dm

@@ -13,7 +13,7 @@
 		holder = atom
 		if(!holder) //don't want this without a holder
 			spawn
-				del src
+				qdel(src)
 		set_desc(steps.len)
 		return
 
@@ -97,7 +97,7 @@
 
 			new result(get_turf(holder))
 			spawn()
-				del holder
+				qdel(holder)
 		return
 
 	proc/set_desc(index as num)

code/datums/spell.dm

@@ -172,7 +172,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			spell.anchored = 1
 			spell.density = 0
 			spawn(overlay_lifespan)
-				del(spell)
+				qdel(spell)
 
 /obj/effect/proc_holder/spell/wizard/proc/after_cast(list/targets)
 	for(var/atom/target in targets)

code/datums/spells/charge.dm

@@ -35,7 +35,7 @@
 				var/obj/item/weapon/spellbook/oneuse/I = item
 				if(prob(80))
 					user.visible_message("<span class='warning'>[I] catches fire!</span>")
-					del(I)
+					qdel(I)
 				else
 					I.used = 0
 					charged_item = I

code/datums/spells/conjure.dm

@@ -46,7 +46,7 @@
 				if(summon_lifespan)
 					spawn(summon_lifespan)
 						if(summoned_object)
-							del(summoned_object)
+							qdel(summoned_object)
 	else
 		switch(charge_type)
 			if("recharge")

code/datums/spells/dumbfire.dm

@@ -76,11 +76,11 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								qdel(trail)
 
 				current_loc = projectile.loc
 
 				sleep(proj_step_delay)
 
 			if(projectile)
-				del(projectile)
+				qdel(projectile)

code/datums/spells/horsemask.dm

@@ -41,7 +41,7 @@
 	target.visible_message(	"<span class='danger'>[target]'s face  lights up in fire, and after the event a horse's head takes its place!</span>", \
 							"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
 	if(!target.unEquip(target.wear_mask))
-		del target.wear_mask
+		qdel(target.wear_mask)
 	target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
 
 	flick("e_flash", target.flash)

code/datums/spells/projectile.dm

@@ -61,7 +61,7 @@
 					break
 
 				if(!proj_lingering && projectile.loc == current_loc) //if it didn't move since last time
-					del(projectile)
+					qdel(projectile)
 					break
 
 				if(proj_trail && projectile)
@@ -72,7 +72,7 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								qdel(trail)
 
 				if(projectile.loc in range(target.loc,proj_trigger_range))
 					projectile.perform(list(target))
@@ -83,4 +83,4 @@
 				sleep(proj_step_delay)
 
 			if(projectile)
-				del(projectile)
+				qdel(projectile)