From e9b8269e13fa2e77d8e3eafd3972e6e8fd2b4ac1 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Tue, 30 Jul 2013 17:38:34 -0400 Subject: [PATCH 1/4] Adds colored department radio channels. --- code/game/communications.dm | 14 ++++++- code/game/machinery/telecomms/broadcaster.dm | 39 ++++++++++++++------ code/stylesheet.dm | 9 ++++- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/code/game/communications.dm b/code/game/communications.dm index 94d53f6bf52..32d8ca69348 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -74,7 +74,6 @@ Radio: 1359 - Security 1441 - death squad 1443 - Confession Intercom -1349 - Miners 1347 - Cargo techs Devices: @@ -110,10 +109,21 @@ var/list/radiochannels = list( "Supply" = 1347, ) //depenging helpers -var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213, 1443, 1441,1347) +var/list/DEPT_FREQS = list(1351, 1355, 1357, 1359, 1213, 1443, 1441, 1347) + +// central command channels, i.e deathsquid & response teams +var/list/CENT_FREQS = list(1441, 1443) + var/const/COMM_FREQ = 1353 //command, colored gold in chat window var/const/SYND_FREQ = 1213 +// department channels +var/const/SEC_FREQ = 1359 +var/const/ENG_FREQ = 1357 +var/const/SCI_FREQ = 1351 +var/const/MED_FREQ = 1355 +var/const/SUP_FREQ = 1347 + #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 4ab483076b7..7302ed81b6c 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -341,12 +341,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept freq_text = "Engineering" if(1359) freq_text = "Security" -// if(1349) -// freq_text = "Mining" if(1347) freq_text = "Supply" if(1441) - freq_text = "Death Squad" + freq_text = "Special Ops" if(1443) freq_text = "Response Team" //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 @@ -365,10 +363,35 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE var/part_c = "" - if (display_freq==SYND_FREQ) + // syndies! + if (display_freq == SYND_FREQ) part_a = "" - else if (display_freq==COMM_FREQ) + + // centcomm channels (deathsquid and ert) + else if (display_freq in CENT_FREQS) + part_a = "" + + // command channel + else if (display_freq == COMM_FREQ) part_a = "" + + // department radio formatting (poorly optimized, ugh) + else if (display_freq == SEC_FREQ) + part_a = "" + + else if (display_freq == ENG_FREQ) + part_a = "" + + else if (display_freq == SCI_FREQ) + part_a = "" + + else if (display_freq == MED_FREQ) + part_a = "" + + else if (display_freq == SUP_FREQ) // cargo + part_a = "" + + // If all else fails and it's a dept_freq, color me purple! else if (display_freq in DEPT_FREQS) part_a = "" @@ -406,8 +429,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(1213) blackbox.msg_syndicate += blackbox_msg -// if(1349) -// blackbox.msg_mining += blackbox_msg if(1347) blackbox.msg_cargo += blackbox_msg else @@ -629,8 +650,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept freq_text = "Engineering" if(1359) freq_text = "Security" -// if(1349) -// freq_text = "Mining" if(1347) 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 @@ -685,8 +704,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(1213) blackbox.msg_syndicate += blackbox_msg -// if(1349) -// blackbox.msg_mining += blackbox_msg if(1347) blackbox.msg_cargo += blackbox_msg else diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 902160e9ef9..fda3fb64e25 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -26,8 +26,15 @@ em {font-style: normal; font-weight: bold;} .deadsay {color: #5c00e6;} .radio {color: #008000;} .deptradio {color: #993399;} -.comradio {color: #885500;} +.comradio {color: #193A7A;} .syndradio {color: #6D3F40;} +.centradio {color: #5C5C8A;} + +.secradio {color: #A30000;} +.engradio {color: #A66300;} +.medradio {color: #008160;} +.sciradio {color: #993399;} +.supradio {color: #5F4519;} .alert {color: #ff0000;} h1.alert, h2.alert {color: #000000;} From bd6b9cceebc1eb708dc2fa5caa2a9ff69fb0592e Mon Sep 17 00:00:00 2001 From: Kilakk Date: Tue, 30 Jul 2013 17:39:02 -0400 Subject: [PATCH 2/4] Removed the tcomms server for the non-existant mining channel. --- code/game/machinery/telecomms/presets.dm | 7 +------ code/game/objects/items/devices/radio/radio.dm | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 2b708ded291..914bd8c9016 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -142,12 +142,7 @@ id = "Supply Server" freq_listening = list(1347) autolinkers = list("supply") -/* -/obj/machinery/telecomms/server/presets/mining - id = "Mining Server" - freq_listening = list(1349) - autolinkers = list("mining") -*/ + /obj/machinery/telecomms/server/presets/common id = "Common Server" freq_listening = list() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 0081954da84..422a27897c0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -499,8 +499,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use freq_text = "Engineering" if(1359) freq_text = "Security" -// if(1349) -// freq_text = "Mining" if(1347) 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 From 7cd50d38a3a0254a4ca236923e5228460e48d19d Mon Sep 17 00:00:00 2001 From: Kilakk Date: Tue, 30 Jul 2013 17:41:03 -0400 Subject: [PATCH 3/4] Committing changelog. --- html/changelog.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index b2b9793dc85..452fd05ce62 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,14 @@ Changelog Section Stuff which is in development and not yet visible to players or just code related (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit though. Thanks. --> +
+

30.07.2013

+

Kilakk updated:

+
    +
  • Added colored department radio channels.
    • +
+
+

28.07.2013

Segrain updated:

From ceb5facd7640055912700f193e2cb0d54a248cb8 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Tue, 30 Jul 2013 17:46:12 -0400 Subject: [PATCH 4/4] Added Erthilo's commit to the changelog - whoops --- html/changelog.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 452fd05ce62..41666cdbbe8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,17 @@ Changelog Section Stuff which is in development and not yet visible to players or just code related (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit though. Thanks. --> +
+

July 30th, 2013

+

Erthilo updated:

+
    +
  • EFTPOS and ATM machines should now connect to databases.
    • +
  • Gravitational Catapults can now be removed from mechs.
    • +
  • Ghost manifest rune paper naming now works correctly.
    • +
  • Fix for newscaster special characters. Still not recommended.
    • +
+
+

30.07.2013

Kilakk updated: