From 614277feed33718e63278b16dbd8e21d208fb650 Mon Sep 17 00:00:00 2001
From: TullyBurnalot <tullybburnalot@gmail.com>
Date: Fri, 6 Jan 2017 12:30:35 +0000
Subject: [PATCH] Wand of Death no longer gibs people, still kills

---
 code/modules/projectiles/projectile/magic.dm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 9e30c4f61c6..3239a219780 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -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))