Merge resolution.

code/modules/projectiles/projectile/bullets.dm

@@ -148,6 +148,7 @@
 	stun = 3
 	weaken = 3
 	penetrating = 5
+	hitscan = 1 //so the PTR isn't useless as a sniper weapon
 
 /obj/item/projectile/bullet/rifle/a556
 	damage = 40
@@ -184,3 +185,15 @@
 /obj/item/projectile/bullet/chameleon
 	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
 	embed = 0 // nope
+
+/* Practice */
+
+/obj/item/projectile/bullet/pistol/practice
+	damage = 5
+
+/obj/item/projectile/bullet/rifle/a556/practice
+	damage = 5
+
+/obj/item/projectile/bullet/shotgun/practice
+	name = "practice"
+	damage = 5

code/modules/projectiles/projectile/change.dm

@@ -19,11 +19,11 @@
 		if(istype(M, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/Robot = M
 			if(Robot.mmi)
-				del(Robot.mmi)
+				qdel(Robot.mmi)
 		else
 			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
 				M.drop_from_inventory(W)
 
@@ -90,7 +90,7 @@
 
 			new_mob << "<span class='warning'>Your form morphs into that of \a [lowertext(randomize)].</span>"
 
-			del(M)
+			qdel(M)
 			return
 		else
 			M << "<span class='warning'>Your form morphs into that of \a [lowertext(randomize)].</span>"

code/modules/projectiles/projectile/special.dm

@@ -65,7 +65,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
@@ -141,12 +141,12 @@
 /obj/item/projectile/icarus/pointdefense/process()
 	Icarus_FireLaser(get_turf(original))
 	spawn
-		del src
+		qdel(src)
 
 	return
 
 /obj/item/projectile/icarus/guns/process()
 	Icarus_FireCannon(get_turf(original))
 	spawn
-		del src
+		qdel(src)
 	return