Merge pull request #3783 from comma/master

Couple o fixes
This commit is contained in:
Mloc
2013-10-16 02:21:37 -07:00
3 changed files with 11 additions and 0 deletions
@@ -63,6 +63,15 @@ obj/item/weapon/gun/energy/staff
update_icon()
return
click_empty(mob/user = null)
if (user)
user.visible_message("*fizzle*", "\red <b>*fizzle*</b>")
else
src.visible_message("*fizzle*")
playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1)
/obj/item/weapon/gun/energy/staff/animate
name = "staff of animation"
desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
+2
View File
@@ -138,6 +138,7 @@
if (!(E.status & ORGAN_DEAD))
E.status |= ORGAN_DEAD
H << "<span class='notice'>You can't feel your [E.display_name] anymore...</span>"
H.update_body(1)
mob.adjustToxLoss(15*multiplier)
deactivate(var/mob/living/carbon/mob,var/multiplier)
@@ -145,6 +146,7 @@
var/mob/living/carbon/human/H = mob
for (var/datum/organ/external/E in H.organs)
E.status &= ~ORGAN_DEAD
H.update_body(1)
/datum/disease2/effect/immortal
name = "Longevity Syndrome"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB