diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 43c82e681c7..15fd0239225 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1176,6 +1176,7 @@
if(has_antag_datum(/datum/antagonist/traitor))
to_chat(current, "You have been brainwashed! You are no longer a traitor!")
remove_antag_datum(/datum/antagonist/traitor)
+ current.client.chatOutput?.clear_syndicate_codes()
log_admin("[key_name(usr)] has de-traitored [key_name(current)]")
message_admins("[key_name_admin(usr)] has de-traitored [key_name_admin(current)]")
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index a2b80440ecb..ba5320cfdb3 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -109,7 +109,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
/datum/announcement/proc/Format_Message(message, message_title, message_announcer, from)
var/formatted_message
formatted_message += "
[message_title]
"
- formatted_message += "
[message]"
+ formatted_message += "
[message]"
if(message_announcer)
formatted_message += "
-[message_announcer]"
@@ -125,7 +125,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
/datum/announcement/priority/Format_Message(message, message_title, message_announcer, from)
var/formatted_message
formatted_message += "[message_title]
"
- formatted_message += "
[message]"
+ formatted_message += "
[message]"
if(message_announcer)
formatted_message += "
-[message_announcer]"
formatted_message += "
"
@@ -136,7 +136,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
var/formatted_message
formatted_message += "[from]
"
if(message_title)
- formatted_message += "
[message_title]
"
+ formatted_message += "
[message_title]
"
formatted_message += "
[message]
"
formatted_message += "
"
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 9672d04ce25..0368957ac11 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -288,8 +288,8 @@
var/responses = jointext(GLOB.syndicate_code_response, ", ")
to_chat(traitor_mob, "The Syndicate have provided you with the following codewords to identify fellow agents:")
- to_chat(traitor_mob, "Code Phrase: [phrases]")
- to_chat(traitor_mob, "Code Response: [responses]")
+ to_chat(traitor_mob, "Code Phrase: [phrases]")
+ to_chat(traitor_mob, "Code Response: [responses]")
antag_memory += "Code Phrase: [phrases]
"
antag_memory += "Code Response: [responses]
"
diff --git a/goon/browserassets/css/browserOutput-dark.css b/goon/browserassets/css/browserOutput-dark.css
index da8eb9d1995..89a5a2d2e29 100644
--- a/goon/browserassets/css/browserOutput-dark.css
+++ b/goon/browserassets/css/browserOutput-dark.css
@@ -424,5 +424,5 @@ h1.alert, h2.alert {color: #FFF;}
.adminticketalt {color: #ccb847; font-weight: bold}
/* Syndicate codewords */
-.codephrases {color: #5555FF;}
-.coderesponses {color: #FF3333;}
+span.body > .codephrases {color: #5555FF;}
+span.body > .coderesponses {color: #FF3333;}
diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css
index ffd642b02bc..abc99d8ce2d 100644
--- a/goon/browserassets/css/browserOutput.css
+++ b/goon/browserassets/css/browserOutput.css
@@ -423,5 +423,5 @@ h1.alert, h2.alert {color: #000000;}
.adminticketalt {color: #014c8a; font-weight: bold}
/* Syndicate codewords */
-.codephrases {color: #0000FF;}
-.coderesponses {color: #FF0000;}
+span.body > .codephrases {color: #0000FF;}
+span.body > .coderesponses {color: #FF0000;}
diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm
index 8e54ae2a985..11aca69220b 100644
--- a/goon/code/datums/browserOutput.dm
+++ b/goon/code/datums/browserOutput.dm
@@ -112,6 +112,10 @@ var/list/chatResources = list(
owner << output(null, "browseroutput:rebootFinished")
if(owner.holder)
loadAdmin()
+ if(owner.mob?.mind?.has_antag_datum(/datum/antagonist/traitor))
+ notify_syndicate_codes() // Send them the current round's codewords
+ else
+ clear_syndicate_codes() // Flush any codewords they may have in chat
for(var/message in messageQueue)
to_chat(owner, message)
@@ -210,6 +214,12 @@ var/list/chatResources = list(
var/urlresponses = url_encode(copytext(responses, 1, length(responses)))
owner << output("[urlphrases]&[urlresponses]", "browseroutput:codewords")
+/**
+ * Clears any locally stored code phrases to highlight
+ */
+/datum/chatOutput/proc/clear_syndicate_codes()
+ notify_syndicate_codes("", "")
+
/client/verb/debug_chat()
set hidden = 1
chatOutput.ehjax_send(data = list("firebug" = 1))