Fix non-icon merge conflicts

code/modules/projectiles/guns/projectile.dm

@@ -41,7 +41,7 @@
 		if(AC.reagents && AC.BB.reagents)
 			var/datum/reagents/casting_reagents = AC.reagents
 			casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts/bullets
-			casting_reagents.delete()
+			qdel(casting_reagents)
 		in_chamber = AC.BB //Load projectile into chamber.
 		AC.BB.loc = src //Set projectile loc to gun.
 		AC.update_icon()

code/modules/projectiles/guns/projectile/crossbow.dm

@@ -312,7 +312,7 @@
 		if(buildstate == 5)
 			user << "\blue You secure the crossbow's various parts."
 			new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
-			del(src)
+			qdel(src)
 		return
 	else
 		..()

code/modules/projectiles/guns/projectile/pneumatic.dm

@@ -158,7 +158,7 @@
 	if(istype(W,/obj/item/pipe))
 		if(buildstate == 0)
 			user.drop_item()
-			del(W)
+			qdel(W)
 			user << "\blue You secure the piping inside the frame."
 			buildstate++
 			update_icon()
@@ -177,7 +177,7 @@
 	else if(istype(W,/obj/item/device/transfer_valve))
 		if(buildstate == 4)
 			user.drop_item()
-			del(W)
+			qdel(W)
 			user << "\blue You install the transfer valve and connect it to the piping."
 			buildstate++
 			update_icon()
@@ -206,7 +206,7 @@
 				playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
 				user << "\blue You weld the valve into place."
 				new /obj/item/weapon/gun/launcher/pneumatic(get_turf(src))
-				del(src)
+				qdel(src)
 		return
 	else
 		..()

code/modules/projectiles/guns/projectile/revolver.dm

@@ -79,7 +79,7 @@
 		M << "<span class='danger'>[src] blows up in your face!</span>"
 		M.take_organ_damage(0,20)
 		M.drop_item()
-		del(src)
+		qdel(src)
 		return 0
 	return 1
 

code/modules/projectiles/guns/projectile/rocket.dm

@@ -46,7 +46,7 @@
 		message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]).")
 		log_game("[key_name_admin(user)] used a rocket launcher ([src.name]).")
 		rockets -= I
-		del(I)
+		qdel(I)
 		return
 	else
 		usr << "\red [src] is empty."