cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address AA

Browse Source
This commit is contained in:
mochi
2020-11-04 21:16:32 +01:00
parent 72ddc710e5
commit e336780fe2
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+1
View File
@@ -1176,6 +1176,7 @@
if(has_antag_datum(/datum/antagonist/traitor))
to_chat(current, "<span class='warning'><FONT size = 3><B>You have been brainwashed! You are no longer a traitor!</B></FONT></span>")
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)]")
code/defines/procs/announce.dm
+3 -3
View File
@@ -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 += "<h2 class='alert'>[message_title]</h2>"
formatted_message += "<br><span class='alert'>[message]</span>"
formatted_message += "<br><span class='alert body'>[message]</span>"
if(message_announcer)
formatted_message += "<br><span class='alert'> -[message_announcer]</span>"
@@ -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 += "<h1 class='alert'>[message_title]</h1>"
formatted_message += "<br><span class='alert'>[message]</span>"
formatted_message += "<br><span class='alert body'>[message]</span>"
if(message_announcer)
formatted_message += "<br><span class='alert'> -[message_announcer]</span>"
formatted_message += "<br>"
@@ -136,7 +136,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
var/formatted_message
formatted_message += "<h1 class='alert'>[from]</h1>"
if(message_title)
formatted_message += "<br><h2 class='alert'>[message_title]</h2>"
formatted_message += "<br><h2 class='alert body'>[message_title]</h2>"
formatted_message += "<br><span class='alert'>[message]</span><br>"
formatted_message += "<br>"
code/modules/antagonists/traitor/datum_traitor.dm
+2 -2
View File
@@ -288,8 +288,8 @@
var/responses = jointext(GLOB.syndicate_code_response, ", ")
to_chat(traitor_mob, "<U><B>The Syndicate have provided you with the following codewords to identify fellow agents:</B></U>")
to_chat(traitor_mob, "<B>Code Phrase: <span class='codephrases'>[phrases]</span></B>")
to_chat(traitor_mob, "<B>Code Response: <span class='coderesponses'>[responses]</span></B>")
to_chat(traitor_mob, "<span class='bold body'>Code Phrase: <span class='codephrases'>[phrases]</span></span>")
to_chat(traitor_mob, "<span class='bold body'>Code Response: <span class='coderesponses'>[responses]</span></span>")
antag_memory += "<b>Code Phrase</b>: <span class='red'>[phrases]</span><br>"
antag_memory += "<b>Code Response</b>: <span class='red'>[responses]</span><br>"
goon/browserassets/css/browserOutput-dark.css
+2 -2
View File
@@ -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;}
goon/browserassets/css/browserOutput.css
+2 -2
View File
@@ -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;}
goon/code/datums/browserOutput.dm
+10
View File
@@ -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))