diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 4049f0f6937..a01b50a088e 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/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" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index acde947ecdf..10dcf66ee00 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/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)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 74523a47289..28bdf2961e2 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/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" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 4c7348b6e48..90de8149672 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/in-hand/staff.dmi b/icons/mob/in-hand/staff.dmi index 2083ea6adc3..3a8f1ebee4f 100644 Binary files a/icons/mob/in-hand/staff.dmi and b/icons/mob/in-hand/staff.dmi differ