diff --git a/code/game/say.dm b/code/game/say.dm
index 7cd4a82b1224a..e7e5db8454e10 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
 	var/namepart
 	var/list/stored_name = list(null)
 	SEND_SIGNAL(speaker, COMSIG_MOVABLE_MESSAGE_GET_NAME_PART, stored_name, visible_name)
-	namepart = stored_name[NAME_PART_INDEX] || "[speaker.GetVoice()]"
+	namepart = "<span style='color: [speaker.chat_color]'>[stored_name[NAME_PART_INDEX] || speaker.GetVoice()]</span>" // Bandastation Addition: span with color
 
 	//End name span.
 	var/endspanpart = "</span>"
@@ -230,7 +230,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
 	processed_input = attach_spans(processed_input, spans)
 
 	var/processed_say_mod = say_emphasis(say_mod)
-	
+
 	return "[processed_say_mod], \"[processed_input]\""
 
 /// Transforms the speech emphasis mods from [/atom/movable/proc/say_emphasis] into the appropriate HTML tags. Includes escaping.