Wand of Death no longer gibs people, still kills

This commit is contained in:
TullyBurnalot
2017-01-06 12:30:35 +00:00
parent 77371a6730
commit 614277feed
+7 -6
View File
@@ -10,9 +10,6 @@
/obj/item/projectile/magic/death
name = "bolt of death"
icon_state = "pulse1_bl"
damage_type = BURN //OXY does not kill IPCs
damage = 50000
nodamage = 0
/obj/item/projectile/magic/fireball
name = "bolt of fireball"
@@ -23,9 +20,13 @@
/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
. = ..()
if(ismob(G))
G.gib()
visible_message("<span class='danger'>[G] explodes violently!")
if(isliving(G))
if(G.stat != DEAD)
G.adjustBruteLoss(300)
visible_message("<span class='danger'>[G] falls backward as life is drained from them!")
else
G.gib()
visible_message("<span class='danger'>[G] explodes violently as the magical energies course through their corpse!")
/obj/item/projectile/magic/fireball/Range()
var/turf/T1 = get_step(src,turn(dir, -45))