Merge pull request #8057 from Aurorablade/Scream

[FIX]Prevents emotes from happening under certain conditions
This commit is contained in:
tigercat2000
2017-09-11 12:41:17 -07:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
@@ -13,13 +13,13 @@
to_chat(user, "<span class='notice'>We begin our stasis, preparing energy to arise once more.</span>")
user.status_flags |= FAKEDEATH //play dead
user.update_canmove()
if(user.stat != DEAD)
user.emote("deathgasp")
user.timeofdeath = world.time
user.status_flags |= FAKEDEATH //play dead
user.update_canmove()
spawn(800)
if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
to_chat(user, "<span class='notice'>We are ready to regenerate.</span>")
@@ -1,6 +1,6 @@
/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force)
if(stat == DEAD)
if((stat == DEAD) || (status_flags & FAKEDEATH))
return // No screaming bodies
var/param = null