From 77371a6730a6b2276ef29f7b679464e9303345b8 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Thu, 5 Jan 2017 22:39:38 +0000 Subject: [PATCH] Wand of Death now gibs people --- code/modules/projectiles/guns/magic/wand.dm | 3 ++- code/modules/projectiles/projectile/magic.dm | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index abde404e87d..fd9a06f2d0b 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -67,7 +67,8 @@ var/message ="You irradiate yourself with pure energy! " message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?") to_chat(user, message) - user.adjustFireLoss(500) + user.gib() + visible_message("[user] has paid the ultimate price for innapropriate wand discipline!") charges-- ..() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 838f1acd90c..9e30c4f61c6 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -21,6 +21,12 @@ damage_type = BRUTE nodamage = 0 +/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G) + . = ..() + if(ismob(G)) + G.gib() + visible_message("[G] explodes violently!") + /obj/item/projectile/magic/fireball/Range() var/turf/T1 = get_step(src,turn(dir, -45)) var/turf/T2 = get_step(src,turn(dir, 45))