diff --git a/code/game/communications.dm b/code/game/communications.dm index 3bc3ee7009..4f13277a31 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -103,16 +103,16 @@ var/list/radiochannels = list( "Medical" = 1355, "Engineering" = 1357, "Security" = 1359, - "Response Team" = 1443, - "Deathsquad" = 1441, + "Response Team" = 1345, + "Deathsquad" = 1341, "Syndicate" = 1213, "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, 1345, 1341, 1347) // central command channels, i.e deathsquid & response teams -var/list/CENT_FREQS = list(1441, 1443) +var/list/CENT_FREQS = list(1345, 1341) var/const/COMM_FREQ = 1353 //command, colored gold in chat window var/const/SYND_FREQ = 1213 diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index d90986a5dd..155f6c6481 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -333,19 +333,19 @@ 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(1359) + if(SEC_FREQ) freq_text = "Security" - if(1347) + if(SUP_FREQ) freq_text = "Supply" - if(1441) + if(1341) freq_text = "Special Ops" - if(1443) + if(1345) 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 diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 914bd8c901..83f3a532b7 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -43,6 +43,13 @@ "supply", "common", "command", "engineering", "security", "receiverA", "receiverB", "broadcasterA", "broadcasterB") +/obj/machinery/telecomms/hub/preset_cent + id = "CentComm Hub" + network = "tcommsat" + heatgen = 0 + autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", + "centcomm", "receiverCent", "broadcasterCent") + //Receivers //--PRESET LEFT--// @@ -68,6 +75,13 @@ freq_listening |= i ..() +/obj/machinery/telecomms/receiver/preset_cent + id = "CentComm Receiver" + network = "tcommsat" + heatgen = 0 + autolinkers = list("receiverCent") + freq_listening = list(1345, 1341) + //Buses @@ -100,6 +114,13 @@ freq_listening |= i ..() +/obj/machinery/telecomms/bus/preset_cent + id = "CentComm Bus" + network = "tcommsat" + freq_listening = list(1345, 1341) + heatgen = 0 + autolinkers = list("processorCent", "centcomm") + //Processors /obj/machinery/telecomms/processor/preset_one @@ -122,6 +143,12 @@ network = "tcommsat" autolinkers = list("processor4") +/obj/machinery/telecomms/processor/preset_cent + id = "CentComm Processor" + network = "tcommsat" + heatgen = 0 + autolinkers = list("processorCent") + //Servers /obj/machinery/telecomms/server/presets @@ -170,6 +197,12 @@ freq_listening = list(1359) autolinkers = list("security") +/obj/machinery/telecomms/server/presets/centcomm + id = "CentComm Server" + freq_listening = list(1345, 1341) + heatgen = 0 + autolinkers = list("centcomm") + //Broadcasters @@ -186,3 +219,9 @@ id = "Broadcaster B" network = "tcommsat" autolinkers = list("broadcasterB") + +/obj/machinery/telecomms/broadcaster/preset_cent + id = "CentComm Broadcaster" + network = "tcommsat" + heatgen = 0 + autolinkers = list("broadcasterCent") \ No newline at end of file diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 8ea48ea489..92de9fff49 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(1441) + R.set_frequency(1341) 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)