From 1c0dfccbc9566806c90cc0f936ec06e6dfc7056c Mon Sep 17 00:00:00 2001
From: quotefox <Quotethefox@hotmail.co.uk>
Date: Mon, 12 Sep 2022 19:54:21 +0100
Subject: [PATCH] Runetime errors with chat.

---
 code/datums/chatmessage.dm         |   4 ++++
 icons/UI_Icons/chat/chat_icons.dmi | Bin 237 -> 337 bytes
 2 files changed, 4 insertions(+)

diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 02f43a12a..8cac8b435 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -59,6 +59,7 @@
   * Calls qdel on the chatmessage when its parent is deleted, used to register qdel signal
   */
 /datum/chatmessage/proc/on_parent_qdel()
+	UnregisterSignal(src, COMSIG_PARENT_QDELETING)
 	qdel(src)
 
 
@@ -107,6 +108,9 @@
 	if (extra_classes.Find("virtual-speaker"))
 		var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "radio")
 		text =  "\icon[r_icon]&nbsp;" + text
+	else if (extra_classes.Find("emote"))
+		var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "emote")
+		text =  "\icon[r_icon]&nbsp;" + text
 
 	// We dim italicized text to make it more distinguishable from regular text
 	var/tgt_color = extra_classes.Find("italics") ? target.chat_color_darkened : target.chat_color
diff --git a/icons/UI_Icons/chat/chat_icons.dmi b/icons/UI_Icons/chat/chat_icons.dmi
index 7040b3966f005388c571bfe40e4cfe6973185e23..8cc4b2c5598fa8818a6b80684a33cc19c4475a2f 100644
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq000sI000RH1^@s6Ki_;00001adQ@0+L}hbh
za%pgMX>V=-0C=2r%CQQAFc1ddIrkJlx|bGQ9BwI*l0n}gkh8hL29iTx-$Cf+_6=W;
z_w)%1{2XYP+O+(@7#>e@hbGHljO4QDHyaouHH#)-bTuX|9l4~nf$<`@*0{;#|B|hk
z+^rtd;^F5&C*08_dM&1E;{X5vlSxEDR49?HlCcfLFbo8rf_BLOZqkLl2k`)zBLjF4
z_wO!^2k<Ti=prD%2uxrD{zgwgJUk@|Nw`$i0Dz>Zs*w~NREdynk}vPz!=MOp)!uLh
zRx`*p32LABKi9{583f&E@bh(>?<KwcN6R2-UC)BL(GowSkd$_eUt@U!PZ50qKHuFo
j`#ZHO5EI2(uG*s=T!m7vO6L#V00000NkvXXu0mjf=eCU2

literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4^3?%3Nf7cA+1o(uw9yo9S$o#XF@qWpr*FY9y
zNswPKgTu2MX+Ta!RY*jMOKNd)QD#9&W_}(6L&conu!5q}?_YuoK7M_o<*loA?#%h%
z4WR}XjUPPHIq#!+lA%avr-gBl@nvJL18*KpIx;Cl!F#2Kp{j9wXScEH<`ohr%%42+
z(e^sy+qz+@Xw2W318qzUyiSsbg#1tb0op0&>Eal|F*7-#BrzeOJ0)QPS8>7#FXsdS
ec@@4X><pPxSZ}&MYHtCmWbkzLb6Mw<&;$Uy!BwyT