Merge pull request #15454 from Kashargul/TimestampImprovements

Fixes timestamp sorting incompatibility.

code/modules/mob/mob.dm

@@ -70,7 +70,8 @@
 		to_chat(src, "<span class='filter_notice'><I>... You can almost hear someone talking ...</I></span>")
 	else
 		if(client.prefs.chat_timestamp)
-			to_chat(src,"[time] [msg]")
+			msg = replacetext(msg, new/regex("^(<span(?: \[^>]*)?>)(.*</span>)", ""), "$1[time] $2")
+			to_chat(src,msg)
 		else if(teleop)
 			to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[msg]")
 		else

code/modules/mob/say_vr.dm

@@ -82,7 +82,7 @@
 
 	if(input)
 		log_subtle(message,src)
-		message = "<span class='emote_subtle'><B>[src]</B> <I>[input]</I></span>"
+		message = "<span class='emotesubtle'><B>[src]</B> <I>[input]</I></span>"
 		if(!(subtle_mode == "Adjacent Turfs (Default)"))
 			message = "<B>(T) </B>" + message
 	else

code/modules/vchat/js/vchat.js

@@ -145,7 +145,7 @@ function start_vue() {
 			//The table to map game css classes to our vchat categories
 			type_table: [
 				{
-					matches: ".filter_say, .say, .emote, .emote_subtle", //VOREStation Edit
+					matches: ".filter_say, .say, .emote, .emotesubtle", //VOREStation Edit
 					becomes: "vc_localchat",
 					pretty: "Local Chat",
 					tooltip: "In-character local messages (say, emote, etc)",