cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2187 from Tenebrosity/newradiofrequencycolours

Browse Source 
Adds new radio frequency colours
This commit is contained in:
Giacom
2014-01-02 10:41:09 -08:00
parent 0cd059432e b3d37e1d0a
commit 09da906881
4 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/communications.dm
+8 -3
View File
@@ -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
code/game/machinery/telecomms/broadcaster.dm
+34 -15
View File
@@ -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 = "<span class='syndradio'><span class='name'>"
else if (display_freq==COMM_FREQ)
part_a = "<span class='comradio'><span class='name'>"
else if (display_freq==SCI_FREQ)
part_a = "<span class='sciradio'><span class='name'>"
else if (display_freq==MED_FREQ)
part_a = "<span class='medradio'><span class='name'>"
else if (display_freq==ENG_FREQ)
part_a = "<span class='engradio'><span class='name'>"
else if (display_freq==SEC_FREQ)
part_a = "<span class='secradio'><span class='name'>"
else if (display_freq in DEPT_FREQS)
part_a = "<span class='deptradio'><span class='name'>"
else if (display_freq==SERV_FREQ)
part_a = "<span class='servradio'><span class='name'>"
else if (display_freq==SUPP_FREQ)
part_a = "<span class='suppradio'><span class='name'>"
else if (display_freq==DSQUAD_FREQ)
part_a = "<span class='dsquadradio'><span class='name'>"
// --- 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 = "<span class='syndradio'><span class='name'>"
else if (display_freq==COMM_FREQ)
part_a = "<span class='comradio'><span class='name'>"
else if (display_freq==SCI_FREQ)
part_a = "<span class='sciradio'><span class='name'>"
else if (display_freq==MED_FREQ)
part_a = "<span class='medradio'><span class='name'>"
else if (display_freq==ENG_FREQ)
part_a = "<span class='engradio'><span class='name'>"
else if (display_freq==SEC_FREQ)
part_a = "<span class='secradio'><span class='name'>"
else if (display_freq in DEPT_FREQS)
part_a = "<span class='deptradio'><span class='name'>"
else if (display_freq==SERV_FREQ)
part_a = "<span class='servradio'><span class='name'>"
else if (display_freq==SUPP_FREQ)
part_a = "<span class='suppradio'><span class='name'>"
else if (display_freq==DSQUAD_FREQ)
part_a = "<span class='dsquadradio'><span class='name'>"
// --- This following recording is intended for research and feedback in the use of department radio channels ---
code/game/objects/items/devices/radio/radio.dm
+17 -7
View File
@@ -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 = "<span class='syndradio'><span class='name'>"
else if (display_freq==COMM_FREQ)
part_a = "<span class='comradio'><span class='name'>"
else if (display_freq==SCI_FREQ)
part_a = "<span class='sciradio'><span class='name'>"
else if (display_freq==MED_FREQ)
part_a = "<span class='medradio'><span class='name'>"
else if (display_freq==ENG_FREQ)
part_a = "<span class='engradio'><span class='name'>"
else if (display_freq==SEC_FREQ)
part_a = "<span class='secradio'><span class='name'>"
else if (display_freq in DEPT_FREQS)
part_a = "<span class='deptradio'><span class='name'>"
else if (display_freq==SERV_FREQ)
part_a = "<span class='servradio'><span class='name'>"
else if (display_freq==SUPP_FREQ)
part_a = "<span class='suppradio'><span class='name'>"
else if (display_freq==DSQUAD_FREQ)
part_a = "<span class='dsquadradio'><span class='name'>"
var/quotedmsg = M.say_quote(message)
interface/stylesheet.dm
+7 -2
View File
@@ -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;}