From e3eb8b0b025647a1b84c7e453ac93182183ba03e Mon Sep 17 00:00:00 2001
From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com>
Date: Mon, 13 Jul 2020 00:58:06 -0300
Subject: [PATCH] few fixes

---
 code/datums/chatmessage.dm                 | 15 +++++++++++++--
 sandcode/code/modules/language/language.dm |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 71b67708af..5c893b1253 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -81,11 +81,22 @@
 	if (length_char(text) > maxlen)
 		text = copytext_char(text, 1, maxlen + 1) + "..." // BYOND index moment
 
+	//SKYRAT CHANGES BEGIND
 	// Calculate target color if not already present
 	if (!target.chat_color || target.chat_color_name != target.name)
-		target.chat_color = colorize_string(target.name)
-		target.chat_color_darkened = colorize_string(target.name, 0.85, 0.85)
+		var/mob/M = target
+		if(GLOB.runechat_color_names[target.name])
+			target.chat_color = GLOB.runechat_color_names[target.name]
+		else if (ismob(target) && M.client?.prefs?.enable_personal_chat_color && M.name == M.real_name && M.name == M.client.prefs.real_name)
+			var/per_color = M.client.prefs.personal_chat_color
+			GLOB.runechat_color_names[target.name] = per_color
+			target.chat_color = per_color
+		else
+			target.chat_color = colorize_string(target.name)
+
+		target.chat_color_darkened = color_shift(target.chat_color, 0.85, 0.85)
 		target.chat_color_name = target.name
+	//SKYRAT CHANGES END
 
 	// Get rid of any URL schemes that might cause BYOND to automatically wrap something in an anchor tag
 	var/static/regex/url_scheme = new(@"[A-Za-z][A-Za-z0-9+-\.]*:\/\/", "g")
diff --git a/sandcode/code/modules/language/language.dm b/sandcode/code/modules/language/language.dm
index b4cccd2987..dc5971e8fd 100644
--- a/sandcode/code/modules/language/language.dm
+++ b/sandcode/code/modules/language/language.dm
@@ -2,6 +2,7 @@
 
 /datum/language/sandcode
 	icon = 'sandcode/icons/misc/language.dmi'
+	icon_state = null
 
 /datum/language/sandcode/sergal
 	name = LANGUAGE_SERGAL