Wizard Update Part 6

- Attempt to fix back sprite for new staffs.
- Fireball wand now has a proximity detonation similar to the fireball
spell.

Ported from /tg/.

code/modules/projectiles/guns/magic/staff.dm

@@ -45,12 +45,12 @@ obj/item/weapon/gun/magic/staff/chaos
 	max_charges = 10
 	recharge_rate = 2
 
-	/obj/item/weapon/gun/magic/staff/chaos/process_chambered() //Snowflake proc, because this uses projectile_type instead of ammo_casing for whatever reason.
-		projectile_type = pick(typesof(/obj/item/projectile/magic))
-		if(in_chamber)	return 1
-		if(!charges)	return 0
-		in_chamber = new projectile_type(src)
-		return 1
+/obj/item/weapon/gun/magic/staff/chaos/process_chambered() //Snowflake proc, because this uses projectile_type instead of ammo_casing for whatever reason.
+	projectile_type = pick(typesof(/obj/item/projectile/magic))
+	if(in_chamber)	return 1
+	if(!charges)	return 0
+	in_chamber = new projectile_type(src)
+	return 1
 
 obj/item/weapon/gun/magic/staff/door
 	name = "staff of door creation"

code/modules/projectiles/guns/magic/wand.dm

@@ -10,6 +10,13 @@
 	var/variable_charges = 1
 	var/drained = 0
 
+/obj/item/projectile/magic/fireball/Range()
+	var/mob/living/L = locate(/mob/living) in (range(src, 1) - firer)
+	if(L && L.stat != DEAD)
+		Bump(L) //Magic Bullet #teachthecontroversy
+		return
+	..()
+
 /obj/item/weapon/gun/magic/wand/New()
 	if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
 		if(prob(33))

code/modules/projectiles/projectile/magic.dm

@@ -17,7 +17,7 @@
 /obj/item/projectile/magic/fireball
 	name = "bolt of fireball"
 	icon_state = "fireball"
-	damage = 25 //The spell fireball additionally does 20 burn, so the wand fireball is marginally less painful
+	damage = 10
 	damage_type = BRUTE
 	nodamage = 0
 	flag = "magic"
@@ -25,6 +25,9 @@
 /obj/item/projectile/magic/fireball/on_hit(var/target)
 	var/turf/T = get_turf(target)
 	explosion(T, -1, 0, 2, 3, 0)
+	if(ismob(target)) //multiple flavors of pain
+		var/mob/living/M = target
+		M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately
 
 /obj/item/projectile/magic/resurrection
 	name = "bolt of resurrection"