From 3e34a31ecb5915160a5335cb430efead34487ca5 Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Mon, 20 Jul 2020 09:45:48 +0100
Subject: [PATCH] Changelings can't do emotes while faking being dead. (#9403)

---
 code/modules/emotes/emote_mob.dm        | 2 +-
 html/changelogs/fakedeath_no_emotes.yml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/fakedeath_no_emotes.yml

diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index 0a2b89bfcac..bf7c6206501 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -6,7 +6,7 @@
 
 /mob/proc/emote(var/act, var/m_type, var/message)
 	// s-s-snowflake
-	if(src.stat == DEAD && act != "deathgasp")
+	if((src.stat == DEAD || src.status_flags & FAKEDEATH) && act != "deathgasp")
 		return
 	if(usr == src) //client-called emote
 		if (client && (client.prefs.muted & MUTE_IC))
diff --git a/html/changelogs/fakedeath_no_emotes.yml b/html/changelogs/fakedeath_no_emotes.yml
new file mode 100644
index 00000000000..d7cae7e2bb8
--- /dev/null
+++ b/html/changelogs/fakedeath_no_emotes.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Changelings that are faking being dead will no longer perform emotes (e.g. screaming)."
\ No newline at end of file