Merge pull request #6074 from TullyBurnalot/Splatterdash

Wand of Death Reliable Killing
This commit is contained in:
Crazy Lemon
2017-01-10 00:27:23 -08:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -67,7 +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.adjustFireLoss(500)
user.adjustFireLoss(3000)
charges--
..()
+6 -3
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"
@@ -21,6 +18,12 @@
damage_type = BRUTE
nodamage = 0
/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
. = ..()
if(isliving(G))
G.adjustFireLoss(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))
var/turf/T2 = get_step(src,turn(dir, 45))