Fixes #6129

code/datums/saycode/speech.dm

@@ -70,6 +70,11 @@
 	speaker << "[type]/render_message(): message_classes = {[list2text(message_classes, ", ")]}"
 #endif
 	var/rendered=message
+	// Sanity
+	if(!lquote)
+		lquote="\""
+	if(!rquote)
+		rquote="\""
 	rendered="<span class='[list2text(message_classes, " ")]'>[lquote][rendered][rquote]</span>"
 	if(language)
 		rendered=language.render_speech(src, rendered)

code/game/gamemodes/blob/overmind.dm

@@ -81,7 +81,7 @@
 	if (!message)
 		return
 
-	var/message_a = say_quote(message)
+	var/message_a = say_quote("\"[html_encode(message)]\"")
 	var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i></font>"
 
 	for (var/mob/camera/blob/S in mob_list)

code/game/machinery/telecomms/broadcaster.dm

@@ -293,7 +293,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 			// --- This following recording is intended for research and feedback in the use of department radio channels ---
 
-		var/blackbox_msg = "[speech.speaker] [speech.speaker.say_quote(speech.message)]"
+		var/enc_message = speech.speaker.say_quote("\"[speech.message]\"") // Does not need to be html_encoded - N3X
+		var/blackbox_msg = "[speech.speaker] [enc_message]"
 
 		if(istype(blackbox))
 			switch(speech.frequency)

code/game/say.dm

@@ -181,7 +181,7 @@ var/global/image/ghostimg = image("icon"='icons/mob/mob.dmi',"icon_state"="ghost
 		else
 			say_testing(speech.speaker," We <i>do</i> understand this gentle\[wo\]man.")
 
-		rendered=html_encode(rendered)
+		rendered="[speech.lquote][html_encode(rendered)][speech.rquote]"
 
 		if(AM)
 			return AM.say_quote(rendered)

code/modules/mob/living/carbon/alien/say.dm

@@ -14,7 +14,7 @@
 	if (!message)
 		return
 
-	var/message_a = say_quote(message)
+	var/message_a = say_quote("\"[html_encode(message)]\"")
 	var/rendered = text("<i><span class='game say'>Hivemind, <span class='name'>[]</span> <span class='message'>[]</span></span></i>",name,message_a)
 	for (var/mob/S in player_list)
 		if((!S.stat && S.hivecheck()) || ((S in dead_mob_list) && !istype(S, /mob/new_player)))

code/modules/mob/living/silicon/mommi/say.dm

@@ -22,7 +22,7 @@
 		log_say("[key_name(src)] (@[msg]) [damage_control_network]: [html_encode(speech.message)]")
 
 
-		var/interior_message = say_quote(html_encode(speech.message))
+		var/interior_message = say_quote("\"[html_encode(speech.message)]\"")
 		var/rendered = "<i><span class='mommi game say'>[damage_control_network], <span class='name'>[name]</span> <span class='message'>[interior_message]</span></span></i>"
 
 		for (var/mob/S in player_list)

code/modules/mob/living/silicon/say.dm

@@ -21,7 +21,7 @@
 	var/turf/T = get_turf(src)
 	log_say("[key_name(src)] (@[T.x],[T.y],[T.z] Binary: [message]")
 
-	var/message_a = say_quote(message)
+	var/message_a = say_quote("\"[html_encode(message)]\"")
 	var/rendered = text("<i><span class='game say'>Robotic Talk, <span class='name'>[]</span> <span class='message'>[]</span></span></i>",name,message_a)
 
 	for (var/mob/S in player_list)