From e4b251a4880a80631145fcced8cf777bf557f2ba Mon Sep 17 00:00:00 2001 From: Tenebrosity Date: Mon, 30 Dec 2013 20:08:20 +1300 Subject: [PATCH 1/2] Adds different radio frequency colours for engineering, security, medical, service and supply. --- code/game/communications.dm | 10 +++-- code/game/machinery/telecomms/broadcaster.dm | 45 ++++++++++++------- .../game/objects/items/devices/radio/radio.dm | 22 ++++++--- interface/stylesheet.dm | 8 +++- 4 files changed, 58 insertions(+), 27 deletions(-) diff --git a/code/game/communications.dm b/code/game/communications.dm index c5fc236456c..c60d68b1483 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -110,10 +110,14 @@ 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 congo brown in chat window +var/const/SUPP_FREQ = 1347 //supply, coloured twine in chat window +var/const/SERV_FREQ = 1349 //service, coloured swamp 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, colored red 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..1ce0f5dd6c2 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,18 @@ 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 = "" // --- Filter the message; place it in quotes apply a verb --- @@ -626,17 +633,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 +669,18 @@ 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 = "" // --- 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 f4ebb92017d..66caa97c733 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,18 @@ 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 = "" var/quotedmsg = M.say_quote(message) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 770dc1b5571..ef7758d989b 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -25,9 +25,13 @@ 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;} .alert {color: #ff0000;} From b3d37e1d0ac2e466d11a09830616fa5ffc61c657 Mon Sep 17 00:00:00 2001 From: Tenebrosity Date: Tue, 31 Dec 2013 16:48:58 +1300 Subject: [PATCH 2/2] Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum. --- code/game/communications.dm | 9 +++++---- code/game/machinery/telecomms/broadcaster.dm | 4 ++++ code/game/objects/items/devices/radio/radio.dm | 2 ++ interface/stylesheet.dm | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/game/communications.dm b/code/game/communications.dm index c60d68b1483..d314da430ca 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -110,14 +110,15 @@ var/list/radiochannels = list( "Service" = 1349, ) //depenging helpers -var/const/SYND_FREQ = 1213 //nuke op frequency, coloured congo brown in chat window -var/const/SUPP_FREQ = 1347 //supply, coloured twine in chat window -var/const/SERV_FREQ = 1349 //service, coloured swamp green 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/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, colored red 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 1ce0f5dd6c2..e1ae4223a80 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -384,6 +384,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept 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 --- @@ -681,6 +683,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept 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 66caa97c733..19238c0d2b8 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -517,6 +517,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use 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 ef7758d989b..bd881f81190 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -33,6 +33,7 @@ em {font-style: normal; font-weight: bold;} .suppradio {color: #a8732b;} .servradio {color: #6eaa2c;} .syndradio {color: #6D3F40;} +.dsquadradio {color: #686868;} .alert {color: #ff0000;} h1.alert, h2.alert {color: #000000;}