From cd06be4fcb90f6d522f4d6c04bbdcf44558d02c8 Mon Sep 17 00:00:00 2001 From: n3ophyt3 Date: Mon, 23 May 2011 01:15:48 +0000 Subject: [PATCH] Department (and command) radio frequencies are no longer shown by their frequency (which you can't manually set a radio to anyway), but rather the department they belong to. This lets people with multi-channel headsets better keep track of conversations. Logs of my testing: Gustavo King says, "test" Gustavo King [145.9] says, "test" Gustavo King says, "test" Gustavo King [Command] says, "test" Gustavo King says, "test" Gustavo King [Security] says, "test" Gustavo King says, "test" Gustavo King [Command] says, "test" Gustavo King says, "test" Gustavo King [Medical] says, "test" Gustavo King says, "test" Gustavo King [Mining] says, "test" git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1610 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/radio/radio.dm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index 5f0be0821c..1491c09bbf 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -209,7 +209,29 @@ Speaker: [li if (length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled)) var/part_a = "" //var/part_b = " \icon[src]\[[format_frequency(frequency)]\] " - var/freq_text = (display_freq!=SYND_FREQ) ? format_frequency(display_freq) : "#unkn" + var/freq_text + switch(display_freq) + if(SYND_FREQ) + freq_text = "#unkn" + if(COMM_FREQ) + freq_text = "Command" + if(1351) + freq_text = "Science" + if(1355) + freq_text = "Medical" + if(1357) + freq_text = "Engineering" + if(1359) + freq_text = "Security" + if(1349) + freq_text = "Mining" + if(1347) + freq_text = "Cargo" + //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 + + if(!freq_text) + freq_text = format_frequency(display_freq) + var/part_b = " \icon[src]\[[freq_text]\] " // Tweaked for security headsets -- TLE var/part_c = ""