diff --git a/baystation12.dme b/baystation12.dme index 6ecdfdcc6a..8d90f2ba4e 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -172,6 +172,7 @@ #include "code\defines\procs\command_alert.dm" #include "code\defines\procs\dbcore.dm" #include "code\defines\procs\hud.dm" +#include "code\defines\procs\radio.dm" #include "code\defines\procs\records.dm" #include "code\defines\procs\sd_Alert.dm" #include "code\defines\procs\statistics.dm" diff --git a/code/WorkInProgress/computer3/networking.dm b/code/WorkInProgress/computer3/networking.dm index 12341e2b6f..4e39da0406 100644 --- a/code/WorkInProgress/computer3/networking.dm +++ b/code/WorkInProgress/computer3/networking.dm @@ -64,7 +64,7 @@ desc = "Radio module for computers" var/datum/radio_frequency/radio_connection = null - var/frequency = 1459 + var/frequency = PUB_FREQ var/filter = null var/range = null var/subspace = 0 diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index ab51bf8ea3..614768a0fe 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -72,7 +72,7 @@ Radio: 1355 - Medical 1357 - Engineering 1359 - Security -1441 - death squad +1341 - death squad 1443 - Confession Intercom 1347 - Cargo techs @@ -96,34 +96,42 @@ On the map: 1455 for AI access */ -var/list/radiochannels = list( - "Common" = 1459, - "Science" = 1351, - "Command" = 1353, - "Medical" = 1355, - "Engineering" = 1357, - "Security" = 1359, - "Response Team" = 1345, - "Deathsquad" = 1341, - "Syndicate" = 1213, - "Supply" = 1347, -) -//depenging helpers -var/list/DEPT_FREQS = list(1351, 1355, 1357, 1359, 1213, 1345, 1341, 1347) - -// central command channels, i.e deathsquid & response teams -var/list/CENT_FREQS = list(1345, 1341) - -var/const/COMM_FREQ = 1353 //command, colored gold in chat window +var/const/COMM_FREQ = 1353 var/const/SYND_FREQ = 1213 +var/const/ERT_FREQ = 1345 +var/const/DTH_FREQ = 1341 +var/const/AI_FREQ = 1447 // department channels +var/const/PUB_FREQ = 1459 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 +var/list/radiochannels = list( + "Common" = PUB_FREQ, + "Science" = SCI_FREQ, + "Command" = COMM_FREQ, + "Medical" = MED_FREQ, + "Engineering" = ENG_FREQ, + "Security" = SEC_FREQ, + "Response Team" = ERT_FREQ, + "Special Ops" = DTH_FREQ, + "Syndicate" = SYND_FREQ, + "Supply" = SUP_FREQ +) + +// central command channels, i.e deathsquid & response teams +var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ) + +// Antag channels, i.e. Syndicate +var/list/ANTAG_FREQS = list(SYND_FREQ) + +//depenging helpers +var/list/DEPT_FREQS = list(SCI_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SUP_FREQ, ERT_FREQ, SYND_FREQ, DTH_FREQ) + #define TRANSMISSION_WIRE 0 #define TRANSMISSION_RADIO 1 @@ -218,7 +226,7 @@ var/global/datum/controller/radio/radio_controller /datum/radio_frequency/proc/send_to_filter(obj/source, datum/signal/signal, var/filter, var/turf/start_point = null, var/range = null) if (range && !start_point) return - + for(var/obj/device in devices[filter]) if(device == source) continue @@ -228,7 +236,7 @@ var/global/datum/controller/radio/radio_controller continue if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range) continue - + //allow sequential signals before round start, so that every air alarm sounding off at once doesn't cause trouble. if(!ticker || ticker.current_state < 3) device.receive_signal(signal, TRANSMISSION_RADIO, frequency) diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm new file mode 100644 index 0000000000..d82ddd8d2e --- /dev/null +++ b/code/defines/procs/radio.dm @@ -0,0 +1,18 @@ +/proc/get_frequency_name(var/display_freq) + var/freq_text + + // the name of the channel + if(display_freq in ANTAG_FREQS) + freq_text = "#unkn" + else + for(var/channel in radiochannels) + if(radiochannels[channel] == display_freq) + freq_text = channel + break + + // --- If the frequency has not been assigned a name, just use the frequency as the name --- + if(!freq_text) + freq_text = format_frequency(display_freq) + + return freq_text + diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 8aa8cf3fa6..6f89c015aa 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -170,6 +170,7 @@ var/global/list/turf/synd_spawn = list() if (nuke_code) synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) synd_mind.current << "The nuclear authorization code is: [nuke_code]" + synd_mind.current << "To speak on the strike team's private channel use :t" var/obj/item/weapon/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" @@ -205,10 +206,8 @@ var/global/list/turf/synd_spawn = list() /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob) - var/radio_freq = SYND_FREQ - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(synd_mob) - R.set_frequency(radio_freq) + R.set_frequency(SYND_FREQ) synd_mob.equip_to_slot_or_del(R, slot_l_ear) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 899f7f42cc..efdde45906 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -274,7 +274,7 @@ var/freq = 1441 var/list/freqlist = list() while (freq <= 1489) - if (freq < 1451 || freq > 1459) + if (freq < 1451 || freq > PUB_FREQ) freqlist += freq freq += 2 if ((freq % 2) == 0) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index f3c521f9d4..1762225088 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -19,7 +19,7 @@ brute_dam_coeff = 0.5 var/atom/movable/load = null // the loaded crate (usually) var/beacon_freq = 1400 - var/control_freq = 1447 + var/control_freq = AI_FREQ suffix = "" diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 9c05abb7fa..6358c1466c 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -43,7 +43,7 @@ var/auto_patrol = 0 // set to make bot automatically patrol var/beacon_freq = 1445 // navigation beacon frequency - var/control_freq = 1447 // bot control frequency + var/control_freq = AI_FREQ // bot control frequency var/turf/patrol_target // this is turf to navigate to (location of beacon) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 35a676d293..5bc531e571 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -59,7 +59,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept signal.data["vmask"], signal.data["vmessage"], signal.data["radio"], signal.data["message"], signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"],, + signal.data["realname"], signal.data["vname"],, signal.data["compression"], signal.data["level"], signal.frequency, signal.data["verb"], signal.data["language"] ) @@ -145,7 +145,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/datum/radio_frequency/connection = signal.data["connection"] - if(connection.frequency == SYND_FREQ) // if syndicate broadcast, just + if(connection.frequency in ANTAG_FREQS) // if antag broadcast, just Broadcast_Message(signal.data["connection"], signal.data["mob"], signal.data["vmask"], signal.data["vmessage"], signal.data["radio"], signal.data["message"], @@ -252,16 +252,14 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if(R.receive_range(display_freq, level) > -1) radios += R - // --- Broadcast to syndicate radio! --- + // --- Broadcast to antag radios! --- else if(data == 3) - - var/datum/radio_frequency/syndicateconnection = radio_controller.return_frequency(SYND_FREQ) - - for (var/obj/item/device/radio/R in syndicateconnection.devices["[RADIO_CHAT]"]) - - if(R.receive_range(SYND_FREQ, level) > -1) - radios += R + for(var/antag_freq in ANTAG_FREQS) + var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(antag_freq) + for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(antag_freq, level) > -1) + radios += R // --- Broadcast to ALL radio devices --- @@ -294,7 +292,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. continue - + // Ghosts hearing all radio chat don't want to hear syndicate intercepts, they're duplicates if(data == 3 && istype(R, /mob/dead/observer) && R.client && (R.client.prefs.toggles & CHAT_GHOSTRADIO)) continue @@ -333,38 +331,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Some miscellaneous variables to format the string output --- */ var/part_a = "" // goes in the actual output - var/freq_text // the name of the channel - - // --- Set the name of the channel --- - switch(display_freq) - - if(SYND_FREQ) - freq_text = "#unkn" - if(COMM_FREQ) - freq_text = "Command" - if(SCI_FREQ) - freq_text = "Science" - if(MED_FREQ) - freq_text = "Medical" - if(ENG_FREQ) - freq_text = "Engineering" - if(SEC_FREQ) - freq_text = "Security" - if(SUP_FREQ) - freq_text = "Supply" - if(1341) - freq_text = "Special Ops" - if(1345) - freq_text = "Response Team" - if(1447) - freq_text = "AI Private" - //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 the frequency has not been assigned a name, just use the frequency as the name --- - - if(!freq_text) - freq_text = format_frequency(display_freq) + var/freq_text = get_frequency_name(display_freq) // --- Some more pre-message formatting --- @@ -374,8 +341,8 @@ 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 = "" - // syndies! - if (display_freq == SYND_FREQ) + // Antags! + if (display_freq in ANTAG_FREQS) part_a = "" // centcomm channels (deathsquid and ert) else if (display_freq in CENT_FREQS) @@ -386,7 +353,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept part_a = "" // AI private channel - else if (display_freq == 1447) + else if (display_freq == AI_FREQ) part_a = "" // department radio formatting (poorly optimized, ugh) @@ -427,23 +394,23 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //BR.messages_admin += blackbox_admin_msg if(istype(blackbox)) switch(display_freq) - if(1459) + if(PUB_FREQ) blackbox.msg_common += blackbox_msg - if(1351) + if(SCI_FREQ) blackbox.msg_science += blackbox_msg - if(1353) + if(COMM_FREQ) blackbox.msg_command += blackbox_msg - if(1355) + if(MED_FREQ) blackbox.msg_medical += blackbox_msg - if(1357) + if(ENG_FREQ) blackbox.msg_engineering += blackbox_msg - if(1359) + if(SEC_FREQ) blackbox.msg_security += blackbox_msg - if(1441) + if(DTH_FREQ) blackbox.msg_deathsquad += blackbox_msg - if(1213) + if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg - if(1347) + if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg else blackbox.messages += blackbox_msg @@ -522,15 +489,15 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept receive |= R.send_hear(display_freq) - // --- Broadcast to syndicate radio! --- + // --- Broadcast to antag radios! --- else if(data == 3) - var/datum/radio_frequency/syndicateconnection = radio_controller.return_frequency(SYND_FREQ) - - for (var/obj/item/device/radio/R in syndicateconnection.devices["[RADIO_CHAT]"]) - var/turf/position = get_turf(R) - if(position && position.z == level) - receive |= R.send_hear(SYND_FREQ) + for(var/freq in ANTAG_FREQS) + var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(freq) + for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + var/turf/position = get_turf(R) + if(position && position.z == level) + receive |= R.send_hear(freq) // --- Broadcast to ALL radio devices --- @@ -584,32 +551,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Some miscellaneous variables to format the string output --- */ var/part_a = "" // goes in the actual output - var/freq_text // the name of the channel - - // --- Set the name of the channel --- - 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(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 - - - // --- If the frequency has not been assigned a name, just use the frequency as the name --- - - if(!freq_text) - freq_text = format_frequency(display_freq) + var/freq_text = get_frequency_name(display_freq) // --- Some more pre-message formatting --- @@ -623,7 +565,7 @@ 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) + if (display_freq in ANTAG_FREQS) part_a = "" else if (display_freq==COMM_FREQ) part_a = "" @@ -639,23 +581,23 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //BR.messages_admin += blackbox_admin_msg if(istype(blackbox)) switch(display_freq) - if(1459) + if(PUB_FREQ) blackbox.msg_common += blackbox_msg - if(1351) + if(SCI_FREQ) blackbox.msg_science += blackbox_msg - if(1353) + if(COMM_FREQ) blackbox.msg_command += blackbox_msg - if(1355) + if(MED_FREQ) blackbox.msg_medical += blackbox_msg - if(1357) + if(ENG_FREQ) blackbox.msg_engineering += blackbox_msg - if(1359) + if(SEC_FREQ) blackbox.msg_security += blackbox_msg - if(1441) + if(DTH_FREQ) blackbox.msg_deathsquad += blackbox_msg - if(1213) + if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg - if(1347) + if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg else blackbox.messages += blackbox_msg @@ -717,7 +659,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept "done" = 0, "level" = pos.z // The level it is being broadcasted at. ) - signal.frequency = 1459// Common channel + signal.frequency = PUB_FREQ// Common channel //#### Sending the signal to all subspace receivers ####// for(var/obj/machinery/telecomms/receiver/R in telecomms_list) diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 6f770ed739..8b4977f106 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -58,7 +58,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(1351, 1355, 1347) // science, medical, supply + freq_listening = list(SCI_FREQ, MED_FREQ, SUP_FREQ) // science, medical, supply //--PRESET RIGHT--// @@ -67,7 +67,7 @@ id = "Receiver B" network = "tcommsat" autolinkers = list("receiverB") // link to relay - freq_listening = list(1353, 1357, 1359) //command, engineering, security + freq_listening = list(COMM_FREQ, ENG_FREQ, SEC_FREQ) //command, engineering, security //Common and other radio frequencies for people to freely use New() @@ -80,7 +80,7 @@ network = "tcommsat" produces_heat = 0 autolinkers = list("receiverCent") - freq_listening = list(1345, 1341) + freq_listening = list(ERT_FREQ, DTH_FREQ) //Buses @@ -88,25 +88,25 @@ /obj/machinery/telecomms/bus/preset_one id = "Bus 1" network = "tcommsat" - freq_listening = list(1351, 1355) + freq_listening = list(SCI_FREQ, MED_FREQ) autolinkers = list("processor1", "science", "medical") /obj/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - freq_listening = list(1347) + freq_listening = list(SUP_FREQ) autolinkers = list("processor2", "supply") /obj/machinery/telecomms/bus/preset_three id = "Bus 3" network = "tcommsat" - freq_listening = list(1359, 1353) + freq_listening = list(SEC_FREQ, COMM_FREQ) autolinkers = list("processor3", "security", "command") /obj/machinery/telecomms/bus/preset_four id = "Bus 4" network = "tcommsat" - freq_listening = list(1357) + freq_listening = list(ENG_FREQ) autolinkers = list("processor4", "engineering", "common") /obj/machinery/telecomms/bus/preset_four/New() @@ -117,7 +117,7 @@ /obj/machinery/telecomms/bus/preset_cent id = "CentComm Bus" network = "tcommsat" - freq_listening = list(1345, 1341) + freq_listening = list(ERT_FREQ, DTH_FREQ) produces_heat = 0 autolinkers = list("processorCent", "centcomm") @@ -157,17 +157,17 @@ /obj/machinery/telecomms/server/presets/science id = "Science Server" - freq_listening = list(1351) + freq_listening = list(SCI_FREQ) autolinkers = list("science") /obj/machinery/telecomms/server/presets/medical id = "Medical Server" - freq_listening = list(1355) + freq_listening = list(MED_FREQ) autolinkers = list("medical") /obj/machinery/telecomms/server/presets/supply id = "Supply Server" - freq_listening = list(1347) + freq_listening = list(SUP_FREQ) autolinkers = list("supply") /obj/machinery/telecomms/server/presets/common @@ -184,22 +184,22 @@ /obj/machinery/telecomms/server/presets/command id = "Command Server" - freq_listening = list(1353) + freq_listening = list(COMM_FREQ) autolinkers = list("command") /obj/machinery/telecomms/server/presets/engineering id = "Engineering Server" - freq_listening = list(1357) + freq_listening = list(ENG_FREQ) autolinkers = list("engineering") /obj/machinery/telecomms/server/presets/security id = "Security Server" - freq_listening = list(1359) + freq_listening = list(SEC_FREQ) autolinkers = list("security") /obj/machinery/telecomms/server/presets/centcomm id = "CentComm Server" - freq_listening = list(1345, 1341) + freq_listening = list(ERT_FREQ, DTH_FREQ) produces_heat = 0 autolinkers = list("centcomm") diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 9dc462814e..0835f6de25 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -40,7 +40,7 @@ var/obj/machinery/bot/secbot/active // the active bot; if null, show bot list var/list/botstatus // the status signal sent by the bot - var/control_freq = 1447 + var/control_freq = AI_FREQ // create a new QM cartridge, and register to receive bot control & beacon message New() @@ -106,7 +106,7 @@ var/list/beacons var/beacon_freq = 1400 - var/control_freq = 1447 + var/control_freq = AI_FREQ // create a new QM cartridge, and register to receive bot control & beacon message New() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 931c2ba598..28646e2105 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -44,7 +44,7 @@ return -1 if (!src.listening) return -1 - if(freq == SYND_FREQ) + if(freq in ANTAG_FREQS) if(!(src.syndie)) return -1//Prevents broadcast of messages over devices lacking the encryption diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index f5da28d0bf..5a927e38ab 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -11,7 +11,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use item_state = "walkietalkie" var/on = 1 // 0 for off var/last_transmission - var/frequency = 1459 //common chat + var/frequency = PUB_FREQ //common chat var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies var/canhear_range = 3 // the range which mobs can hear this radio from var/obj/item/device/radio/patch_link = null @@ -215,7 +215,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, message, from, "Automated Announcement", from, "synthesized voice", - 4, 0, list(1), 1459) + 4, 0, list(1), PUB_FREQ) del(A) return @@ -495,31 +495,12 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use 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 - 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(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 - - if(!freq_text) - freq_text = format_frequency(display_freq) + var/freq_text= get_frequency_name(display_freq) var/part_b = " \icon[src]\[[freq_text]\] " // Tweaked for security headsets -- TLE var/part_c = "" - if (display_freq==SYND_FREQ) + if (display_freq in ANTAG_FREQS) part_a = "" else if (display_freq==COMM_FREQ) part_a = "" @@ -536,25 +517,23 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if(istype(blackbox)) //BR.messages_admin += blackbox_admin_msg switch(display_freq) - if(1459) + if(PUB_FREQ) blackbox.msg_common += blackbox_msg - if(1351) + if(SCI_FREQ) blackbox.msg_science += blackbox_msg - if(1353) + if(COMM_FREQ) blackbox.msg_command += blackbox_msg - if(1355) + if(MED_FREQ) blackbox.msg_medical += blackbox_msg - if(1357) + if(ENG_FREQ) blackbox.msg_engineering += blackbox_msg - if(1359) + if(SEC_FREQ) blackbox.msg_security += blackbox_msg - if(1441) + if(DTH_FREQ) blackbox.msg_deathsquad += blackbox_msg - if(1213) + if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg - if(1349) - blackbox.msg_mining += blackbox_msg - if(1347) + if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg else blackbox.messages += blackbox_msg @@ -635,7 +614,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/turf/position = get_turf(src) if(!position || !(position.z in level)) return -1 - if(freq == SYND_FREQ) + if(freq in ANTAG_FREQS) if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys return -1 if (!on) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index e8a92edbe3..b107182333 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -124,7 +124,7 @@ var/global/sent_strike_team = 0 /mob/living/carbon/human/proc/equip_death_commando(leader_selected = 0) var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) - R.set_frequency(1341) + R.set_frequency(DTH_FREQ) equip_to_slot_or_del(R, slot_l_ear) if (leader_selected == 0) equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform) diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index 9f736e3ae4..d023f20782 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -3,7 +3,7 @@ var/global/vox_tick = 1 /mob/living/carbon/human/proc/equip_vox_raider() var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src) - R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. + R.set_frequency(SYND_FREQ) equip_to_slot_or_del(R, slot_l_ear) equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index cf5044edbb..2ff6abba53 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -216,7 +216,6 @@ var/obj/machinery/blackbox_recorder/blackbox var/list/msg_security = list() var/list/msg_deathsquad = list() var/list/msg_syndicate = list() - var/list/msg_mining = list() var/list/msg_cargo = list() var/list/datum/feedback_variable/feedback = new() @@ -241,7 +240,6 @@ var/obj/machinery/blackbox_recorder/blackbox BR.msg_security = msg_security BR.msg_deathsquad = msg_deathsquad BR.msg_syndicate = msg_syndicate - BR.msg_mining = msg_mining BR.msg_cargo = msg_cargo BR.feedback = feedback BR.messages = messages @@ -282,7 +280,6 @@ var/obj/machinery/blackbox_recorder/blackbox feedback_add_details("radio_usage","SEC-[msg_security.len]") feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]") feedback_add_details("radio_usage","SYN-[msg_syndicate.len]") - feedback_add_details("radio_usage","MIN-[msg_mining.len]") feedback_add_details("radio_usage","CAR-[msg_cargo.len]") feedback_add_details("radio_usage","OTH-[messages.len]") feedback_add_details("radio_usage","PDA-[pda_msg_amt]") diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index 64f6caec5b..dfecd5979b 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/device.dmi' icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" - var/frequency = 1459 + var/frequency = PUB_FREQ var/scan_ticks = 0 var/obj/item/device/radio/target_radio diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index fbaf7ed06f..2e84639917 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -122,7 +122,7 @@ client/verb/tcsrun() if(Server.freq_listening.len > 0) signal.frequency = Server.freq_listening[1] else - signal.frequency = 1459 + signal.frequency = PUB_FREQ signal.data["name"] = "" signal.data["job"] = "" signal.data["reject"] = 0 diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index 634b3b78d0..4fdd54f31b 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -62,13 +62,13 @@ interpreter.SetVar("WEST" , WEST) // WEST (8) // Channel macros - interpreter.SetVar("$common", 1459) - interpreter.SetVar("$science", 1351) - interpreter.SetVar("$command", 1353) - interpreter.SetVar("$medical", 1355) - interpreter.SetVar("$engineering",1357) - interpreter.SetVar("$security", 1359) - interpreter.SetVar("$supply", 1347) + interpreter.SetVar("$common", PUB_FREQ) + interpreter.SetVar("$science", SCI_FREQ) + interpreter.SetVar("$command", COMM_FREQ) + interpreter.SetVar("$medical", MED_FREQ) + interpreter.SetVar("$engineering",ENG_FREQ) + interpreter.SetVar("$security", SEC_FREQ) + interpreter.SetVar("$supply", SUP_FREQ) // Signal data @@ -236,7 +236,7 @@ datum/signal source = "[html_encode(uppertext(S.id))]" hradio = new // sets the hradio as a radio intercom if(!freq) - freq = 1459 + freq = PUB_FREQ if(findtext(num2text(freq), ".")) // if the frequency has been set as a decimal freq *= 10 // shift the decimal one place