From e0183093ca9d5a00006eb1bb5ea21e7f8d5c68df Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Sat, 29 May 2021 01:38:24 -0400
Subject: [PATCH] Emote formatter returns a list

---
 code/modules/emotes/emote_mob.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index cbc53019d86..61544715803 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -149,7 +149,7 @@
 	subtext = html_encode(subtext)
 	// Store the player's name in a nice bold, naturalement
 	nametext = "<B>[emoter]</B>"
-	return pretext + nametext + subtext
+	return list("pretext" = pretext, "nametext" = nametext, "subtext" = subtext)
 
 /mob/proc/custom_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/range = world.view)
 
@@ -163,8 +163,10 @@
 	else
 		input = message
 
+	var/list/formatted
 	if(input)
-		message = format_emote(src, message)
+		formatted = format_emote(src, message)
+		message = formatted["pretext"] + formatted["nametext"] + formatted["subtext"]
 	else
 		return