diff --git a/code/game/communications.dm b/code/game/communications.dm index c5fc236456c..d314da430ca 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -110,10 +110,15 @@ var/list/radiochannels = list( "Service" = 1349, ) //depenging helpers -var/list/DEPT_FREQS = list(1351,1355,1357,1213,1441,1347,1349) -var/const/SEC_FREQ = 1359 //security, colored cyan in chat window +var/const/SYND_FREQ = 1213 //nuke op frequency, coloured dark brown in chat window +var/const/SUPP_FREQ = 1347 //supply, coloured light brown in chat window +var/const/SERV_FREQ = 1349 //service, coloured green in chat window +var/const/SCI_FREQ = 1351 //science, coloured plum in chat window var/const/COMM_FREQ = 1353 //command, colored gold in chat window -var/const/SYND_FREQ = 1213 +var/const/MED_FREQ = 1355 //medical, coloured blue in chat window +var/const/ENG_FREQ = 1357 //engineering, coloured orange in chat window +var/const/SEC_FREQ = 1359 //security, coloured red in chat window +var/const/DSQUAD_FREQ = 1441 //death squad frequency, coloured grey in chat window #define TRANSMISSION_WIRE 0 #define TRANSMISSION_RADIO 1 diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 9a600d06112..e1ae4223a80 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -340,17 +340,17 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept freq_text = "#unkn" if(COMM_FREQ) freq_text = "Command" - if(1351) + if(SCI_FREQ) freq_text = "Science" - if(1355) + if(MED_FREQ) freq_text = "Medical" - if(1357) + if(ENG_FREQ) freq_text = "Engineering" if(SEC_FREQ) freq_text = "Security" - if(1349) + if(SERV_FREQ) freq_text = "Service" - if(1347) + if(SUPP_FREQ) freq_text = "Supply" //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO @@ -372,11 +372,20 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept part_a = "" else if (display_freq==COMM_FREQ) part_a = "" + else if (display_freq==SCI_FREQ) + part_a = "" + else if (display_freq==MED_FREQ) + part_a = "" + else if (display_freq==ENG_FREQ) + part_a = "" else if (display_freq==SEC_FREQ) part_a = "" - else if (display_freq in DEPT_FREQS) - part_a = "" - + else if (display_freq==SERV_FREQ) + part_a = "" + else if (display_freq==SUPP_FREQ) + part_a = "" + else if (display_freq==DSQUAD_FREQ) + part_a = "" // --- Filter the message; place it in quotes apply a verb --- @@ -626,17 +635,17 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept freq_text = "#unkn" if(COMM_FREQ) freq_text = "Command" - if(1351) + if(SCI_FREQ) freq_text = "Science" - if(1355) + if(MED_FREQ) freq_text = "Medical" - if(1357) + if(ENG_FREQ) freq_text = "Engineering" if(SEC_FREQ) freq_text = "Security" - if(1349) + if(SERV_FREQ) freq_text = "Service" - if(1347) + if(SUPP_FREQ) freq_text = "Supply" //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO @@ -662,10 +671,20 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept part_a = "" else if (display_freq==COMM_FREQ) part_a = "" + else if (display_freq==SCI_FREQ) + part_a = "" + else if (display_freq==MED_FREQ) + part_a = "" + else if (display_freq==ENG_FREQ) + part_a = "" else if (display_freq==SEC_FREQ) part_a = "" - else if (display_freq in DEPT_FREQS) - part_a = "" + else if (display_freq==SERV_FREQ) + part_a = "" + else if (display_freq==SUPP_FREQ) + part_a = "" + else if (display_freq==DSQUAD_FREQ) + part_a = "" // --- This following recording is intended for research and feedback in the use of department radio channels --- diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b96310ea445..34ea1dd09b8 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -481,17 +481,17 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use freq_text = "#unkn" if(COMM_FREQ) freq_text = "Command" - if(1351) + if(SCI_FREQ) freq_text = "Science" - if(1355) + if(MED_FREQ) freq_text = "Medical" - if(1357) + if(ENG_FREQ) freq_text = "Engineering" if(SEC_FREQ) freq_text = "Security" - if(1349) + if(SERV_FREQ) freq_text = "Service" - if(1347) + if(SUPP_FREQ) freq_text = "Supply" //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO @@ -505,10 +505,20 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use part_a = "" else if (display_freq==COMM_FREQ) part_a = "" + else if (display_freq==SCI_FREQ) + part_a = "" + else if (display_freq==MED_FREQ) + part_a = "" + else if (display_freq==ENG_FREQ) + part_a = "" else if (display_freq==SEC_FREQ) part_a = "" - else if (display_freq in DEPT_FREQS) - part_a = "" + else if (display_freq==SERV_FREQ) + part_a = "" + else if (display_freq==SUPP_FREQ) + part_a = "" + else if (display_freq==DSQUAD_FREQ) + part_a = "" var/quotedmsg = M.say_quote(message) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 770dc1b5571..bd881f81190 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -25,10 +25,15 @@ em {font-style: normal; font-weight: bold;} .say {} .deadsay {color: #5c00e6;} .radio {color: #008000;} -.deptradio {color: #993399;} +.sciradio {color: #993399;} .comradio {color: #ACA82D;} -.secradio {color: #3182ac;} +.secradio {color: #B22222;} +.medradio {color: #337296;} +.engradio {color: #fb5613;} +.suppradio {color: #a8732b;} +.servradio {color: #6eaa2c;} .syndradio {color: #6D3F40;} +.dsquadradio {color: #686868;} .alert {color: #ff0000;} h1.alert, h2.alert {color: #000000;}