From 77371a6730a6b2276ef29f7b679464e9303345b8 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Thu, 5 Jan 2017 22:39:38 +0000 Subject: [PATCH 1/4] 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)) From 614277feed33718e63278b16dbd8e21d208fb650 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Fri, 6 Jan 2017 12:30:35 +0000 Subject: [PATCH 2/4] 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("[G] explodes violently!") + if(isliving(G)) + if(G.stat != DEAD) + G.adjustBruteLoss(300) + visible_message("[G] falls backward as life is drained from them!") + else + G.gib() + visible_message("[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)) From 69ff538a02dd3642300bb973c2d8d416fdcd1621 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Sat, 7 Jan 2017 01:06:47 +0000 Subject: [PATCH 3/4] 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 ="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.gib() - visible_message("[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("[G] falls backward as life is drained from them!") - else - G.gib() - visible_message("[G] explodes violently as the magical energies course through their corpse!") + G.adjustBruteLoss(3000) + visible_message("[G] topples backwards as the death bolt impacts them!") /obj/item/projectile/magic/fireball/Range() var/turf/T1 = get_step(src,turn(dir, -45)) From ecaf8678ab368d7e3918cb0dd777360bc914b5be Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Sat, 7 Jan 2017 15:15:17 +0000 Subject: [PATCH 4/4] Wand of Death now deals Burn --- code/modules/projectiles/guns/magic/wand.dm | 2 +- code/modules/projectiles/projectile/magic.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index f7055600aa7..f743d29f275 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -67,7 +67,7 @@ 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.adjustBruteLoss(3000) + user.adjustFireLoss(3000) charges-- ..() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 201d6c9c053..95447e2441f 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -21,7 +21,7 @@ /obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G) . = ..() if(isliving(G)) - G.adjustBruteLoss(3000) + G.adjustFireLoss(3000) visible_message("[G] topples backwards as the death bolt impacts them!") /obj/item/projectile/magic/fireball/Range()