[MIRROR] Zombies now stay dead if they suicide (#2914)

* Zombies now stay dead if they suicide (#30941)

* Zombies now stay dead if they suicide

* Update items.dm

* Update items.dm

* Zombies now stay dead if they suicide
This commit is contained in:
CitadelStationBot
2017-09-23 05:54:36 -05:00
committed by Poojawa
parent f26bada520
commit 139130d70d
2 changed files with 12 additions and 0 deletions
+10
View File
@@ -49,6 +49,16 @@
infection = new()
infection.Insert(target)
/obj/item/zombie_hand/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(isliving(user))
var/mob/living/L = user
var/obj/item/bodypart/O = L.get_bodypart("head")
if(O)
O.dismember()
return (BRUTELOSS)
/obj/item/zombie_hand/proc/check_feast(mob/living/target, mob/living/user)
if(target.stat == DEAD)
var/hp_gained = target.maxHealth
+2
View File
@@ -48,6 +48,8 @@
if(timer_id)
return
if(owner.suiciding)
return
if(owner.stat != DEAD && !converts_living)
return
if(!iszombie(owner))