From e783be45dc7fbfcbce73636d8da884837cb8cc36 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Wed, 29 Jun 2016 18:23:17 +0100 Subject: [PATCH] fixes farting dead (#4823) fixes #4821 wasn't anything to do with the deathgasp fix, and it was only the *me emote, but yeah, not good :cl: VampyrBytes fix: No more *me emoting from your corpse! / :cl: --- code/datums/Emote_system/emote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm index 41216634ebe..84f444ef5f4 100644 --- a/code/datums/Emote_system/emote.dm +++ b/code/datums/Emote_system/emote.dm @@ -552,6 +552,7 @@ one is used in /datum/emote_handler/customEmote(). /datum/emote/custom/prevented(var/mob/user) if(!user.use_me) return "you are prevented from using custom emotes" + return ..() // Yeah, no /datum/emote/custom/createSelfMessage(var/mob/user, var/list/params, var/message = "") @@ -566,9 +567,8 @@ one is used in /datum/emote_handler/customEmote(). emoteSpanClass = "game deadsay" /datum/emote/custom/ghost/prevented(var/mob/user) - . = ..() - if(.) - return + if(!user.use_me) + return "you are prevented from using custom emotes" if(user.client.prefs.muted & MUTE_DEADCHAT) return "you are muted from deadchat" if(!(user.client.prefs.toggles & CHAT_DEAD))