Skip to content

Commit

Permalink
Healing wand/staff regenerate limbs on use (tgstation#17532)
Browse files Browse the repository at this point in the history
* Fully_heal regenerates limbs

* Working in the browser is such a bad idea

* Seriously not a great idea

* Don't do this at home kids
  • Loading branch information
Incoming5643 authored and KorPhaeron committed May 12, 2016
1 parent 49e78d7 commit 2368de5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/modules/projectiles/guns/magic/wand.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@

/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user)
user.revive(full_heal = 1)
if(iscarbon(user))
var/mob/living/carbon/C = user
C.regenerate_limbs()
user << "<span class='notice'>You feel great!</span>"
charges--
..()
Expand Down Expand Up @@ -162,4 +165,4 @@
/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user)
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
charges--
..()
..()
3 changes: 3 additions & 0 deletions code/modules/projectiles/projectile/magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
if(target.hellbound)
return
if(ismob(target))
if(iscarbon(target))
var/mob/living/carbon/C = target
C.regenerate_limbs()
if(target.revive(full_heal = 1))
if(!target.ckey)
for(var/mob/dead/observer/ghost in player_list)
Expand Down

0 comments on commit 2368de5

Please sign in to comment.