Fix non-icon merge conflicts

code/modules/projectiles/projectile/beams.dm

@@ -197,21 +197,21 @@
 			if(TT == firer.loc)
 				continue
 			if(TT.density)
-				del(X)
+				qdel(X)
 				break
 			for(var/atom/O in TT)
 				if(istype(O,/mob/living))
 					if(O.density)
-						del(X)
+						qdel(X)
 						broke = 1
 						break
 				if(!O.CanPass(src))
-					del(X)
+					qdel(X)
 					broke = 1
 					break
 			if(broke)
 				if(X)
-					del(X)
+					qdel(X)
 				break
 		spawn
 			while(src) //Move until we hit something
@@ -264,7 +264,7 @@
 					if(src.loc != current)
 						tang = adjustAngle(get_angle(src.loc,current))
 					icon_state = "[tang]"
-			del(src)
+			qdel(src)
 		return
 	/*cleanup(reference) //Waits .3 seconds then removes the overlay.
 		//world << "setting invisibility"

code/modules/projectiles/projectile/magic.dm

@@ -56,7 +56,7 @@
 				O.mind.transfer_to(A)
 			else
 				A.key = O.key
-			del(O)
+			qdel(O)
 			target = A
 		else
 			target.revive()
@@ -136,15 +136,15 @@ proc/wabbajack(mob/living/M)
 
 			if(istype(M, /mob/living/silicon/robot))
 				var/mob/living/silicon/robot/Robot = M
-				if(Robot.mmi)	del(Robot.mmi)
+				if(Robot.mmi)	qdel(Robot.mmi)
 			else
 				if(ishuman(M))
 					var/mob/living/carbon/human/H = M
 					// Make sure there are no organs or limbs to drop
 					for(var/t in H.organs)
-						del(t)
+						qdel(t)
 					for(var/i in H.internal_organs)
-						del(i)
+						qdel(i)
 				for(var/obj/item/W in M)
 					M.unEquip(W)
 
@@ -240,7 +240,7 @@ proc/wabbajack(mob/living/M)
 
 			new_mob << "<B>Your form morphs into that of a [randomize].</B>"
 
-			del(M)
+			qdel(M)
 			return new_mob
 
 /obj/item/projectile/magic/animate
@@ -265,7 +265,7 @@ proc/wabbajack(mob/living/M)
 					S << "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator."
 				H = change
 				H.loc = S
-				del(src)
+				qdel(src)
 		else
 			var/obj/O = change
 			new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)

code/modules/projectiles/projectile/special.dm

@@ -82,7 +82,7 @@
 				for(var/mob/M in range(10, src))
 					if(!M.stat && !istype(M, /mob/living/silicon/ai))\
 						shake_camera(M, 3, 1)
-				del(src)
+				qdel(src)
 				return 1
 		else
 			return 0
@@ -167,7 +167,7 @@
 		new /obj/effect/decal/cleanable/ash(src.loc)
 		src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
 		playsound(src, 'sound/effects/snap.ogg', 50, 1)
-		del(src)
+		qdel(src)
 
 /obj/item/projectile/kinetic
 	name = "kinetic force"
@@ -210,7 +210,7 @@ obj/item/projectile/kinetic/New()
 
 /obj/item/effect/kinetic_blast/New()
 	spawn(4)
-		del(src)
+		qdel(src)
 
 /obj/item/projectile/bullet/frag12
 	name ="explosive slug"