From ae67b26c11bd4367d38297c38ef872ea6ca56a97 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 30 Jun 2021 15:29:05 -0400 Subject: [PATCH] Merge pull request #10760 from VOREStation/Arokha/fixemote Fix a couple cases of missing emotes --- code/modules/emotes/emote_mob.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index d017325872..31bb795b31 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -168,6 +168,8 @@ var/runemessage if(input) formatted = format_emote(src, message) + if(!islist(formatted)) + return message = formatted["pretext"] + formatted["nametext"] + formatted["subtext"] runemessage = formatted["subtext"] // This is just personal preference (but I'm objectively right) that custom emotes shouldn't have periods at the end in runechat