From 69ff538a02dd3642300bb973c2d8d416fdcd1621 Mon Sep 17 00:00:00 2001
From: TullyBurnalot <tullybburnalot@gmail.com>
Date: Sat, 7 Jan 2017 01:06:47 +0000
Subject: [PATCH] Readjusts Wand of Death for pure bugfix

---
 code/modules/projectiles/guns/magic/wand.dm  | 3 +--
 code/modules/projectiles/projectile/magic.dm | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index fd9a06f2d0b..f7055600aa7 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -67,8 +67,7 @@
 	var/message ="<span class='warning'>You irradiate yourself with pure energy! "
 	message += pick("Do not pass go. Do not collect 200 zorkmids.</span>","You feel more confident in your spell casting skills.</span>","You Die...</span>","Do you want your possessions identified?</span>")
 	to_chat(user, message)
-	user.gib()
-	visible_message("<span class='danger'>[user] has paid the ultimate price for innapropriate wand discipline!")
+	user.adjustBruteLoss(3000)
 	charges--
 	..()
 
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 3239a219780..201d6c9c053 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -21,12 +21,8 @@
 /obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
 	. = ..()
 	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!")
+		G.adjustBruteLoss(3000)
+		visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts them!</span>")
 
 /obj/item/projectile/magic/fireball/Range()
 	var/turf/T1 = get_step(src,turn(dir, -45))