Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

code/modules/projectiles/ammunition/boxes.dm

@@ -40,6 +40,10 @@
 	name = "magazine (.45 rubber)"
 	ammo_type = /obj/item/ammo_casing/c45r
 
+/obj/item/ammo_magazine/c45m/practice
+	name = "magazine (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/c45p
+
 /obj/item/ammo_magazine/c45m/flash
 	name = "magazine (.45 flash)"
 	ammo_type = "/obj/item/ammo_casing/c45f"
@@ -90,6 +94,10 @@
 	name = "top mounted magazine (9mm rubber)"
 	ammo_type = /obj/item/ammo_casing/c9mmr
 
+/obj/item/ammo_magazine/mc9mmt/practice
+	name = "top mounted magazine (9mm practice)"
+	ammo_type = /obj/item/ammo_casing/c9mmp
+
 /obj/item/ammo_magazine/c45
 	name = "ammunition Box (.45)"
 	icon_state = "9mm"
@@ -130,6 +138,10 @@
 /obj/item/ammo_magazine/a556/empty
 	initial_ammo = 0
 
+/obj/item/ammo_magazine/a556/practice
+	name = "magazine (5.56mm practice)"
+	ammo_type = /obj/item/ammo_casing/a556p
+
 /obj/item/ammo_magazine/a50
 	name = "magazine (.50)"
 	icon_state = "50ae"

code/modules/projectiles/ammunition/bullets.dm

@@ -38,12 +38,22 @@
 	caliber = "9mm"
 	projectile_type = /obj/item/projectile/bullet/pistol/rubber
 
+/obj/item/ammo_casing/c9mmp
+	desc = "A 9mm practice bullet casing."
+	caliber = "9mm"
+	projectile_type = /obj/item/projectile/bullet/pistol/practice
+
 
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
 	caliber = ".45"
 	projectile_type = /obj/item/projectile/bullet/pistol/medium
 
+/obj/item/ammo_casing/c45p
+	desc = "A .45 practice bullet casing."
+	caliber = ".45"
+	projectile_type = /obj/item/projectile/bullet/pistol/practice
+
 /obj/item/ammo_casing/c45r
 	desc = "A .45 rubber bullet casing."
 	caliber = ".45"
@@ -82,6 +92,13 @@
 	projectile_type = /obj/item/projectile/bullet/blank
 	matter = list("metal" = 90)
 
+/obj/item/ammo_casing/shotgun/practice
+	name = "shotgun shell"
+	desc = "A practice shell."
+	icon_state = "pshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun/practice
+	matter = list("metal" = 90)
+
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag shell"
 	desc = "A beanbag shell."
@@ -130,6 +147,11 @@
 	caliber = "a556"
 	projectile_type = /obj/item/projectile/bullet/rifle/a556
 
+/obj/item/ammo_casing/a556p
+	desc = "A 5.56mm practice bullet casing."
+	caliber = "a556"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/practice
+
 /obj/item/ammo_casing/rocket
 	name = "rocket shell"
 	desc = "A high explosive designed to be fired from a launcher."

code/modules/projectiles/effects.dm

@@ -13,7 +13,7 @@
 
 /obj/effect/projectile/proc/activate()
 	spawn(3)
-		delete()	//see effect_system.dm - sets loc to null and lets GC handle removing these effects
+		qdel(src)	//see effect_system.dm - sets loc to null and lets GC handle removing these effects
 
 	return
 
@@ -100,13 +100,13 @@
 //----------------------------
 /obj/effect/projectile/emitter/tracer
 	icon_state = "emitter"
-	
+
 /obj/effect/projectile/emitter/muzzle
 	icon_state = "muzzle_emitter"
-	
+
 /obj/effect/projectile/emitter/impact
 	icon_state = "impact_emitter"
-	
+
 //----------------------------
 // Stun beam
 //----------------------------

code/modules/projectiles/gun.dm

@@ -260,7 +260,7 @@
 		else
 			user << "<span class = 'notice'>Ow...</span>"
 			user.apply_effect(110,AGONY,0)
-		del(in_chamber)
+		qdel(in_chamber)
 		mouthshoot = 0
 		return
 	else

code/modules/projectiles/guns/alien.dm

@@ -20,7 +20,7 @@
 	processing_objects.Add(src)
 	last_regen = world.time
 
-/obj/item/weapon/gun/launcher/spikethrower/Del()
+/obj/item/weapon/gun/launcher/spikethrower/Destroy()
 	processing_objects.Remove(src)
 	..()
 

code/modules/projectiles/guns/energy.dm

@@ -31,7 +31,7 @@
 		processing_objects.Add(src)
 	update_icon()
 
-/obj/item/weapon/gun/energy/Del()
+/obj/item/weapon/gun/energy/Destroy()
 	if(self_recharge)
 		processing_objects.Remove(src)
 	..()

code/modules/projectiles/guns/energy/temperature.dm

@@ -18,7 +18,7 @@
 	processing_objects.Add(src)
 
 
-/obj/item/weapon/gun/energy/temperature/Del()
+/obj/item/weapon/gun/energy/temperature/Destroy()
 	processing_objects.Remove(src)
 	..()
 

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

@@ -43,7 +43,7 @@
 		user  << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
 		var/obj/item/weapon/shard/shrapnel/S = new()
 		S.loc = get_turf(src)
-		src.Del()
+		qdel(src)
 
 /obj/item/weapon/gun/launcher/crossbow
 	name = "powered crossbow"
@@ -257,7 +257,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/launcher/pneumatic.dm

@@ -150,7 +150,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()
@@ -168,7 +168,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()
@@ -197,7 +197,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/dartgun.dm

@@ -27,7 +27,7 @@
 	projectile_type = /obj/item/projectile/bullet/chemdart
 
 /obj/item/ammo_casing/chemdart/expend()
-	del(src)
+	qdel(src)
 
 /obj/item/ammo_magazine/chemdart
 	name = "dart cartridge"

code/modules/projectiles/projectile/bullets.dm

@@ -8,7 +8,7 @@
 	embed = 1
 	sharp = 1
 	var/mob_passthrough_check = 0
-	
+
 	muzzle_type = /obj/effect/projectile/bullet/muzzle
 
 /obj/item/projectile/bullet/on_hit(var/atom/target, var/blocked = 0)
@@ -38,8 +38,8 @@
 	if(ismob(A))
 		if(!mob_passthrough_check)
 			return 0
-		if(iscarbon(A))
-			damage *= 0.7 //squishy mobs absorb KE
+		if(iscarbon(A))
+			damage *= 0.7 //squishy mobs absorb KE
 		return 1
 
 	var/chance = 0
@@ -184,3 +184,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

code/modules/projectiles/targeting.dm

@@ -40,7 +40,7 @@
 		for(var/mob/living/M in aim_targets)
 			if(M)
 				M.NotTargeted(src) //Untargeting people.
-		del(aim_targets)
+		qdel(aim_targets)
 
 //Compute how to fire.....
 //Return 1 if a target was found, 0 otherwise.
@@ -69,7 +69,7 @@
 			for(var/mob/living/L in aim_targets)
 				if(L)
 					L.NotTargeted(src)
-			del(aim_targets)
+			qdel(aim_targets)
 			usr.visible_message("<span class='danger'><b>[usr] turns \the [src] on [M]!</b></span>")
 		else
 			usr.visible_message("<span class='danger'><b>[usr] aims \a [src] at [M]!</b></span>")
@@ -234,13 +234,13 @@
 	targeted_by -= I
 	I.aim_targets.Remove(src) //De-target them
 	if(!I.aim_targets.len)
-		del(I.aim_targets)
+		qdel(I.aim_targets)
 	var/mob/living/T = I.loc //Remove the targeting icons
 	if(T && ismob(T) && !I.aim_targets && T.client)
 		T.client.remove_gun_icons()
 	if(!targeted_by.len)
-		del target_locked //Remove the overlay
-		del targeted_by
+		qdel(target_locked) //Remove the overlay
+		qdel(targeted_by)
 	spawn(1) update_targeted()
 
 /mob/living/Move()
@@ -308,7 +308,7 @@
 	else
 		usr << "Target may no longer move."
 		target_can_run = 0
-		del(usr.gun_run_icon)	//no need for icon for running permission
+		qdel(usr.gun_run_icon)	//no need for icon for running permission
 
 	//Updating walking permission button
 	if(usr.gun_move_icon)