From 2c6a4cabfc707e8f4277dd74b14952334b5b8eb1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 7 Sep 2017 18:37:24 -0400 Subject: [PATCH 1/3] screan --- code/modules/mob/living/carbon/human/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 3dc48f3df1a..80bd78b05df 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -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 From 5a9a8f0983667f1453903af968f40c1b909a2a02 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 7 Sep 2017 23:33:27 -0400 Subject: [PATCH 2/3] fix for emote block --- code/game/gamemodes/changeling/powers/fakedeath.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index dc7454ff7eb..3ac2a7856ab 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -13,13 +13,14 @@ to_chat(user, "We begin our stasis, preparing energy to arise once more.") - 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 + spawn(800) if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers) to_chat(user, "We are ready to regenerate.") From 639ed85e3e2d61bd30ee9895a910d2cf4d9a3cb0 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 10 Sep 2017 23:21:15 -0400 Subject: [PATCH 3/3] Tiger Change --- code/game/gamemodes/changeling/powers/fakedeath.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index 3ac2a7856ab..7cd29c55021 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -13,13 +13,12 @@ to_chat(user, "We begin our stasis, preparing energy to arise once more.") - 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)