From aa1186ae2de64e5291a70881ba81897e74cd8d59 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Fri, 23 Oct 2015 14:57:18 -0700 Subject: [PATCH 1/2] Dead humans are now no longer able to emote --- code/modules/mob/living/carbon/human/emote.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 414335a243e..6bc82f363d7 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,4 +1,8 @@ /mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force) + + if (stat == DEAD) + return // No screaming bodies + var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -814,4 +818,4 @@ set desc = "Sets an extended description of your character's features." set category = "IC" - flavor_text = TextPreview(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text) + flavor_text = TextPreview(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text) \ No newline at end of file From 95e574d4d5dbeecc1f75a18a341da58e70df8860 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Fri, 23 Oct 2015 15:16:58 -0700 Subject: [PATCH 2/2] Moves around the deathgasp emote in the human death proc This should prevent the death check from stopping our dying gasp --- code/modules/mob/living/carbon/human/death.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 4307c6cbd0b..fc2bc6e4c0e 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -84,6 +84,9 @@ if(stat == DEAD) return if(healths) healths.icon_state = "health5" + if(!gibbed) + emote("deathgasp") //let the world KNOW WE ARE DEAD + stat = DEAD dizziness = 0 jitteriness = 0 @@ -128,8 +131,6 @@ H.mind.kills += "[name] ([ckey])" if(!gibbed) - emote("deathgasp") //let the world KNOW WE ARE DEAD - update_canmove() if(client) blind.layer = 0 @@ -175,4 +176,4 @@ /mob/living/carbon/human/proc/Drain() ChangeToHusk() mutations |= NOCLONE - return + return \ No newline at end of file