From 63e4ff2cf7830a9eff545dbfd053cef6c2d31575 Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:07:01 -0800
Subject: [PATCH 1/5] the great radio changes
---
code/__DEFINES/radio.dm | 20 ++++-----
code/controllers/subsystem/blackbox.dm | 6 +--
code/game/communications.dm | 6 +--
code/game/machinery/cloning.dm | 2 +-
code/game/machinery/computer/arcade.dm | 8 ++--
code/game/machinery/doors/brigdoors.dm | 4 +-
code/game/machinery/requests_console.dm | 2 +-
code/game/machinery/telecomms/broadcasting.dm | 6 ---
.../telecomms/machine_interactions.dm | 12 ++----
code/game/machinery/telecomms/machines/bus.dm | 4 +-
.../machinery/telecomms/machines/receiver.dm | 2 +-
.../machinery/telecomms/machines/relay.dm | 14 +++----
.../machinery/telecomms/machines/server.dm | 2 +-
.../items/devices/radio/encryptionkey.dm | 14 ++-----
.../objects/items/devices/radio/headset.dm | 5 +--
code/game/say.dm | 3 +-
.../components/unary_devices/cryo.dm | 2 +-
code/modules/clothing/outfits/standard.dm | 2 +-
code/modules/clothing/under/syndicate.dm | 2 +-
code/modules/mob/living/living_say.dm | 6 +--
code/modules/mob/living/silicon/ai/ai.dm | 2 +-
.../mob/living/simple_animal/bot/firebot.dm | 2 +-
.../mob/living/simple_animal/bot/mulebot.dm | 1 -
.../mob/living/simple_animal/bot/secbot.dm | 4 +-
.../mob/living/simple_animal/parrot.dm | 4 +-
code/modules/unit_tests/say.dm | 2 +-
interface/stylesheet.dm | 5 +--
tgui/packages/tgui-panel/chat/constants.js | 2 +-
.../tgui-panel/styles/tgchat/chat-dark.scss | 10 ++---
.../tgui-panel/styles/tgchat/chat-light.scss | 10 ++---
tgui/packages/tgui/constants.ts | 42 +++++++++----------
31 files changed, 81 insertions(+), 125 deletions(-)
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
index f6686232993d..0c5c92d419ca 100644
--- a/code/__DEFINES/radio.dm
+++ b/code/__DEFINES/radio.dm
@@ -5,14 +5,9 @@
#define RADIO_CHANNEL_COMMON "Common"
#define RADIO_KEY_COMMON ";"
-#define RADIO_CHANNEL_COMMAND "Command"
-#define RADIO_KEY_COMMAND "c"
-#define RADIO_TOKEN_COMMAND ":c"
-
-#define RADIO_CHANNEL_AI_PRIVATE "AI Private"
-#define RADIO_KEY_AI_PRIVATE "o"
-#define RADIO_TOKEN_AI_PRIVATE ":o"
-
+#define RADIO_CHANNEL_EMERGENCY "Emergency"
+#define RADIO_KEY_EMERGENCY "c"
+#define RADIO_TOKEN_EMERGENCY ":c"
#define RADIO_CHANNEL_SYNDICATE "Syndicate"
#define RADIO_KEY_SYNDICATE "t"
@@ -51,15 +46,15 @@
#define MIN_FREE_FREQ 1201 // -------------------------------------------------
// Frequencies are always odd numbers and range from 1201 to 1599.
-#define FREQ_SYNDICATE 1213 // Nuke op comms frequency, dark brown
-#define FREQ_CENTCOM 1337 // CentCom comms frequency, gray
+#define FREQ_SYNDICATE 1213 // Syndicate Coalition comms frequency, dark brown
+#define FREQ_CENTCOM 1337 // NT-CentCom comms frequency, gray
#define FREQ_SOLGOV 1345 // SolGov comms frequency, dark blue WS ADDITION
#define FREQ_INTEQ 1347 // Inteq comms frequency, light brown
#define FREQ_PGF 1349 // PGF comms frequency, lime green
#define FREQ_NANOTRASEN 1351 // Nanotrasen comms frequency, plum
-#define FREQ_COMMAND 1353 // Command comms frequency, gold
+#define FREQ_EMERGENCY 1353 // Emergency comms frequency, red
#define FREQ_MINUTEMEN 1355 // Minutemen comms frequency, soft blue
-#define FREQ_PIRATE 1359 // Pirate comms frequency, red
+#define FREQ_PIRATE 1359 // Pirate comms frequency, gold
#define FREQ_HOLOGRID_SOLUTION 1433
#define FREQ_STATUS_DISPLAYS 1435
@@ -72,7 +67,6 @@
#define FREQ_ATMOS_STORAGE 1441
#define FREQ_NAV_BEACON 1445
-#define FREQ_AI_PRIVATE 1447 // AI private comms frequency, magenta
#define FREQ_PRESSURE_PLATE 1447
#define FREQ_AIRLOCK_CONTROL 1449
#define FREQ_ELECTROPACK 1449
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index ab325d49ebe7..19e8f9e77b55 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -132,8 +132,8 @@ SUBSYSTEM_DEF(blackbox)
record_feedback("tally", "radio_usage", 1, "common")
if(FREQ_NANOTRASEN)
record_feedback("tally", "radio_usage", 1, "nanotrasen")
- if(FREQ_COMMAND)
- record_feedback("tally", "radio_usage", 1, "command")
+ if(FREQ_EMERGENCY)
+ record_feedback("tally", "radio_usage", 1, "emergency")
if(FREQ_MINUTEMEN)
record_feedback("tally", "radio_usage", 1, "minutemen")
if(FREQ_INTEQ)
@@ -148,8 +148,6 @@ SUBSYSTEM_DEF(blackbox)
record_feedback("tally", "radio_usage", 1, "centcom")
if(FREQ_SOLGOV) //WS Edit - SolGov Rep
record_feedback("tally", "radio_usage", 1, "solgov") //WS Edit - SolGov Rep
- if(FREQ_AI_PRIVATE)
- record_feedback("tally", "radio_usage", 1, "ai private")
else
record_feedback("tally", "radio_usage", 1, "other")
diff --git a/code/game/communications.dm b/code/game/communications.dm
index 2ee368eaa891..e3b1acc230d2 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(all_radios)
GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_COMMON = FREQ_COMMON,
- RADIO_CHANNEL_COMMAND = FREQ_COMMAND,
+ RADIO_CHANNEL_EMERGENCY = FREQ_EMERGENCY,
RADIO_CHANNEL_CENTCOM = FREQ_CENTCOM,
RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV,
RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND,
@@ -102,12 +102,11 @@ GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_PGF = FREQ_PGF,
RADIO_CHANNEL_INTEQ = FREQ_INTEQ,
RADIO_CHANNEL_PIRATE = FREQ_PIRATE,
- RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE,
))
GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_COMMON]" = RADIO_CHANNEL_COMMON,
- "[FREQ_COMMAND]" = RADIO_CHANNEL_COMMAND,
+ "[FREQ_EMERGENCY]" = RADIO_CHANNEL_EMERGENCY,
"[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM,
"[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV,
"[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND,
@@ -117,7 +116,6 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_PGF]" = RADIO_CHANNEL_PGF,
"[FREQ_INTEQ]" = RADIO_CHANNEL_INTEQ,
"[FREQ_PIRATE]" = RADIO_CHANNEL_PIRATE,
- "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE,
))
/datum/radio_frequency
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ad4cd3834f06..ac34d49b847c 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -39,7 +39,7 @@
var/internal_radio = TRUE
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_com
- var/radio_channel = RADIO_CHANNEL_COMMAND
+ var/radio_channel = RADIO_CHANNEL_EMERGENCY
var/obj/effect/countdown/clonepod/countdown
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index fa09867a4807..33ffc2de511c 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -528,11 +528,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(gamers[gamer] > 2 && prob(20 * gamers[gamer]))
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_EMERGENCY)
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_EMERGENCY)
gamers[gamer] = -1
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 213b15c00ced..3a71835c172b 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -115,8 +115,8 @@
return 0
if(!forced)
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_EMERGENCY)
timing = FALSE
activation_time = null
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index ed3a35c1e228..c33b3ea8bdcc 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
if(href_list["send"] && message && to_department && priority)
- var/radio_freq = FREQ_COMMAND
+ var/radio_freq = FREQ_EMERGENCY
var/datum/signal/subspace/messaging/rc/signal = new(src, list(
"sender" = department,
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 9f2711ebb7a7..9c3af38b0b44 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -155,12 +155,6 @@
if(R.can_receive(frequency, map_zones))
radios += R
- // Syndicate radios can hear all well-known radio channels
- if (num2text(frequency) in GLOB.reverseradiochannels)
- for(var/obj/item/radio/R in GLOB.all_radios["[FREQ_SYNDICATE]"])
- if(R.can_receive(FREQ_SYNDICATE, map_zones))
- radios |= R
-
if (TRANSMISSION_RADIO)
// Only radios not currently in subspace mode
for(var/obj/item/radio/R in GLOB.all_radios["[frequency]"])
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 202a9c8a620d..47bbb494fb80 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -124,14 +124,10 @@
tempfreq = sanitize_frequency(text2num(params["value"]) * 10, TRUE) //WS Edit - add frequency filter fix
if("freq")
var/newfreq = tempfreq //WS Edit - add frequency filter fix
- if(newfreq == FREQ_SYNDICATE)
- to_chat(operator, "Error: Interference preventing filtering frequency: \"[newfreq / 10] GHz\"")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
- else
- if(!(newfreq in freq_listening) && newfreq < 10000)
- freq_listening.Add(newfreq)
- log_game("[key_name(operator)] added frequency [newfreq] for [src] at [AREACOORD(src)].")
- . = TRUE
+ if(!(newfreq in freq_listening) && newfreq < 10000)
+ freq_listening.Add(newfreq)
+ log_game("[key_name(operator)] added frequency [newfreq] for [src] at [AREACOORD(src)].")
+ . = TRUE
if("delete")
freq_listening.Remove(params["value"])
log_game("[key_name(operator)] added removed frequency [params["value"]] for [src] at [AREACOORD(src)].")
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index 6428456d1614..a4d19e61ac47 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -23,7 +23,7 @@
if(!istype(signal) || !is_freq_listening(signal))
return
- if(change_frequency && signal.frequency != FREQ_SYNDICATE)
+ if(change_frequency)
signal.frequency = change_frequency
if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it
@@ -50,7 +50,7 @@
/obj/machinery/telecomms/bus/preset_one
id = "General Communications Bus"
network = "tcommsat"
- freq_listening = list(FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_COMMON)
autolinkers = list("processor1", "command", "common", "messaging", "receiverA")
/obj/machinery/telecomms/bus/preset_two
diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm
index 33b0bc7028ec..7e68e535c93e 100644
--- a/code/game/machinery/telecomms/machines/receiver.dm
+++ b/code/game/machinery/telecomms/machines/receiver.dm
@@ -48,7 +48,7 @@
id = "Receiver A"
network = "tcommsat"
autolinkers = list("receiverA") // link to relay
- freq_listening = list(FREQ_SOLGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_SOLGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_EMERGENCY, FREQ_COMMON)
//--PRESET RIGHT--//
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 763c42dbbf9c..9e40b5a7351f 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -74,37 +74,37 @@
autolinkers = list("r_relay")
/obj/machinery/telecomms/relay/preset/nanotrasen
- freq_listening = list(FREQ_COMMAND, FREQ_NANOTRASEN)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_NANOTRASEN)
id = "Nanotrasen Relay"
network = "nt_commnet"
/obj/machinery/telecomms/relay/preset/inteq
- freq_listening = list(FREQ_COMMAND, FREQ_INTEQ)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_INTEQ)
id = "IRMG Relay"
network = "irmg_commnet"
/obj/machinery/telecomms/relay/preset/minutemen
- freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_MINUTEMEN)
id = "CLIP Relay"
network = "clip_commnet"
/obj/machinery/telecomms/relay/preset/solgov
- freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_SOLGOV)
id = "SolGov Relay"
network = "solgov_commnet"
/obj/machinery/telecomms/relay/preset/syndicate
- freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_SYNDICATE)
id = "Syndicate Relay"
network = "synd_commnet"
/obj/machinery/telecomms/relay/preset/frontiersmen
- freq_listening = list(FREQ_COMMAND, FREQ_PIRATE)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_PIRATE)
id = "Frontiersmen Relay"
network = "frontier_commnet"
/obj/machinery/telecomms/relay/preset/pgf
- freq_listening = list(FREQ_COMMAND, FREQ_PGF)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_PGF)
id = "PGF Relay"
network = "pgf_commnet"
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index 5607b6bbec8c..e2cb7addcd8d 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -116,7 +116,7 @@
/obj/machinery/telecomms/server/presets/command
id = "Command Server"
- freq_listening = list(FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_COMMON)
autolinkers = list("command")
/obj/machinery/telecomms/server/presets/common/birdstation/Initialize()
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index f8ced22c54be..d93760363e71 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -63,12 +63,12 @@
/obj/item/encryptionkey/headset_com
name = "command radio encryption key"
icon_state = "com_cypherkey"
- channels = list(RADIO_CHANNEL_COMMAND = 1)
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1)
/obj/item/encryptionkey/heads/captain
name = "\proper the captain's encryption key"
icon_state = "cap_cypherkey"
- channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit - Wideband radio
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit - Wideband radio
/obj/item/encryptionkey/headset_cent
name = "\improper CentCom radio encryption key"
@@ -77,10 +77,7 @@
channels = list(RADIO_CHANNEL_CENTCOM = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit- Wideband Radio
/obj/item/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
- channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_AI_PRIVATE = 1)
-
-/obj/item/encryptionkey/secbot
- channels = list(RADIO_CHANNEL_AI_PRIVATE = 1)
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1)
/obj/item/encryptionkey/solgov
name = "\improper SolGov encryption key"
@@ -88,11 +85,6 @@
icon_state = "solgov_cypherkey"
channels = list(RADIO_CHANNEL_SOLGOV = 1)
-// /obj/item/encryptionkey/suns
-// name = "\improper SUNS encryption key"
-// icon_state = "suns_cypherkey"
-// channels = list(RADIO_CHANNEL_SUNS = 1)
-
/obj/item/encryptionkey/wideband
name = "wideband encryption key"
icon = 'icons/obj/radio.dmi'
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index c649c1e3f594..9e4af7ac59a1 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -1,7 +1,7 @@
// Used for translating channels to tokens on examination
GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_COMMON = RADIO_KEY_COMMON,
- RADIO_CHANNEL_COMMAND = RADIO_TOKEN_COMMAND,
+ RADIO_CHANNEL_EMERGENCY = RADIO_TOKEN_EMERGENCY,
RADIO_CHANNEL_CENTCOM = RADIO_TOKEN_CENTCOM,
RADIO_CHANNEL_SOLGOV = RADIO_TOKEN_SOLGOV, //WS Edit - SolGov Rep
RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE,
@@ -10,8 +10,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_PGF = RADIO_TOKEN_PGF,
RADIO_CHANNEL_INTEQ = RADIO_TOKEN_INTEQ,
RADIO_CHANNEL_PIRATE = RADIO_TOKEN_PIRATE,
- MODE_BINARY = MODE_TOKEN_BINARY,
- RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE
+ MODE_BINARY = MODE_TOKEN_BINARY
))
/obj/item/radio/headset
diff --git a/code/game/say.dm b/code/game/say.dm
index c92b984dbb77..bfa9d35ac5bc 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -9,8 +9,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_INTEQ]" = "irmgradio",
"[FREQ_PGF]" = "pgfradio",
"[FREQ_PIRATE]" = "pirradio",
- "[FREQ_COMMAND]" = "comradio",
- "[FREQ_AI_PRIVATE]" = "aiprivradio",
+ "[FREQ_EMERGENCY]" = "emrgradio",
"[FREQ_SYNDICATE]" = "syndradio",
"[FREQ_CENTCOM]" = "centcomradio",
"[FREQ_SOLGOV]" = "solgovradio",
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 5ff6b2e396b5..6bd2308d929b 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -28,7 +28,7 @@
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_com
- var/radio_channel = RADIO_CHANNEL_COMMAND
+ var/radio_channel = RADIO_CHANNEL_EMERGENCY
var/running_anim = FALSE
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 3e76c4d88bd1..3687ff2c166f 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -49,7 +49,7 @@
var/obj/item/radio/R = H.ears
if(R)
- R.set_frequency(FREQ_SYNDICATE)
+ R.set_frequency(FREQ_PIRATE)
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 82b4b663a66b..81975898844d 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -267,7 +267,7 @@
name = "inteq corpsman skirtleneck"
desc = "A sterile white turtleneck with a free flowing black skirt, it is emblazoned with the lettering 'IRMG' on the shoulder. For the IRMG's support division Corpsmen."
icon_state = "inteqmed_skirt"
- supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/under/syndicate/inteq/skirt/maid
name = "inteq tactical maid outfit"
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 2e0c07be8fd7..abe8b52c6c1e 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
MODE_KEY_DEPARTMENT = MODE_DEPARTMENT,
- RADIO_KEY_COMMAND = RADIO_CHANNEL_COMMAND,
+ RADIO_KEY_EMERGENCY = RADIO_CHANNEL_EMERGENCY,
// Faction
RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE,
@@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
MODE_KEY_DEADMIN = MODE_DEADMIN,
// Misc
- RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel
MODE_KEY_VOCALCORDS = MODE_VOCALCORDS, // vocal cords, used by Voice of God
@@ -38,7 +37,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
"ð" = MODE_DEPARTMENT,
- "ñ" = RADIO_CHANNEL_COMMAND,
+ "ñ" = RADIO_CHANNEL_EMERGENCY,
// Faction
"å" = RADIO_CHANNEL_SYNDICATE,
@@ -53,7 +52,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"â" = MODE_ADMIN,
// Misc
- "ù" = RADIO_CHANNEL_AI_PRIVATE,
"÷" = MODE_VOCALCORDS
))
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index cfd7d9153c8d..7913cdb7eb7e 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -126,7 +126,7 @@
to_chat(src, "To use something, simply click on it.")
to_chat(src, "Use say :b to speak to your cyborgs through binary.")
to_chat(src, "For department channels, use the following say commands:")
- to_chat(src, ":o - AI Private, :c - Command.")
+ to_chat(src, ":c - Command.")
show_laws()
to_chat(src, "These laws may be changed by other players, or by you being the traitor.")
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index ba8eafba9010..0fabc6c7fb53 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -15,7 +15,7 @@
maxHealth = 25
radio_key = /obj/item/encryptionkey/headset_com
- radio_channel = RADIO_CHANNEL_COMMAND
+ radio_channel = RADIO_CHANNEL_EMERGENCY
bot_type = FIRE_BOT
model = "Firebot"
bot_core = /obj/machinery/bot_core/firebot
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 5191ee1ba0c8..1c10311f7b3c 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -657,7 +657,6 @@
to_chat(calling_ai, "[icon2html(src, calling_ai)] [src] wirelessly plays a chiming sound!")
calling_ai.playsound_local(calling_ai, 'sound/machines/chime.ogg', 40, FALSE)
calling_ai = null
- radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
if(report_delivery)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 1445eab16fbe..8aadc7ed1182 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -10,8 +10,7 @@
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
pass_flags = PASSMOB
- radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security
- radio_channel = RADIO_CHANNEL_COMMAND //Security channel
+ radio_channel = RADIO_CHANNEL_EMERGENCY //Security channel
bot_type = SEC_BOT
model = "Securitron"
bot_core_type = /obj/machinery/bot_core/secbot
@@ -71,7 +70,6 @@
/mob/living/simple_animal/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- radio_channel = RADIO_CHANNEL_AI_PRIVATE
/mob/living/simple_animal/bot/secbot/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index b39793d9a414..92b955d3a841 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -259,8 +259,8 @@
switch(ch)
if(RADIO_CHANNEL_NANOTRASEN)
available_channels.Add(RADIO_TOKEN_NANOTRASEN)
- if(RADIO_CHANNEL_COMMAND)
- available_channels.Add(RADIO_TOKEN_COMMAND)
+ if(RADIO_CHANNEL_EMERGENCY)
+ available_channels.Add(RADIO_TOKEN_EMERGENCY)
if(RADIO_CHANNEL_MINUTEMEN)
available_channels.Add(RADIO_TOKEN_MINUTEMEN)
if(RADIO_CHANNEL_INTEQ)
diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm
index d3fa6e6cdfc7..c725fcdc6dd8 100644
--- a/code/modules/unit_tests/say.dm
+++ b/code/modules/unit_tests/say.dm
@@ -8,7 +8,7 @@
test("Hello", "Hello", list())
test(";HELP", "HELP", list(MODE_HEADSET = TRUE))
test(";%Never gonna give you up", "Never gonna give you up", list(MODE_HEADSET = TRUE, MODE_SING = TRUE))
- test(".c Gun plz", "Gun plz", list(RADIO_KEY = RADIO_KEY_COMMAND, RADIO_EXTENSION = RADIO_CHANNEL_COMMAND))
+ test(".c Gun plz", "Gun plz", list(RADIO_KEY = RADIO_KEY_EMERGENCY, RADIO_EXTENSION = RADIO_CHANNEL_EMERGENCY))
test("...What", "...What", list())
/datum/unit_test/get_message_mods/proc/test(message, expected_message, list/expected_mods)
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 16cc956b5f73..d324bd882a30 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -43,14 +43,13 @@ em {font-style: normal; font-weight: bold;}
.binarysay a:active, .binarysay a:visited {color: #88ff88;}
.radio {color: #008000;}
.ntradio {color: #4e3399;}
-.comradio {color: #948f02;}
-.pirradio {color: #a30000;}
+.emrgradio {color: #a30000;}
+.pirradio {color: #948f02;}
.clipradio {color: #337296;}
.irmgradio {color: #885231;}
.pgfradio {color: #127a35;}
.syndradio {color: ##612425;}
.centcomradio {color: #686868;}
-.aiprivradio {color: #ff00ff;}
.redteamradio {color: #ff0000;}
.blueteamradio {color: #0000ff;}
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index 94ce7aa51cf3..0f4a9c052880 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
- '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .pgfradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .emrgradio, .pirradio, .clipradio, .irmgradio, .pgfradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
},
{
type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 8e734f25da41..1acd0cf0094c 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -338,12 +338,12 @@ em {
color: #7f6cd4;
}
-.comradio {
- color: #fcdf03;
+.emrgradio {
+ color: #dd3535;
}
.pirradio {
- color: #dd3535;
+ color: #fcdf03;
}
.clipradio {
@@ -374,10 +374,6 @@ em {
color: #8de7b6;
}
-.aiprivradio {
- color: #d65d95;
-}
-
.redteamradio {
color: #ff4444;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index ae52ba0bfd88..49ccc958d5cf 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -358,12 +358,12 @@ em {
color: #4e3399;
}
-.comradio {
- color: #948f02;
+.emrgradio {
+ color: #dd3535;
}
.pirradio {
- color: #a30000;
+ color: #fcdf03;
}
.clipradio {
@@ -394,10 +394,6 @@ em {
color: #508166;
}
-.aiprivradio {
- color: #ff00ff;
-}
-
.redteamradio {
color: #ff0000;
}
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index e17958e787f3..98636319c88d 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -70,7 +70,7 @@ export const CSS_COLORS = [
/* IF YOU CHANGE THIS KEEP IT IN SYNC WITH CHAT CSS */
export const RADIO_CHANNELS = [
{
- name: 'Syndicate',
+ name: 'Coalition',
freq: 1213,
color: '#8f4a4b',
},
@@ -95,55 +95,55 @@ export const RADIO_CHANNELS = [
color: '#fdfd34',
},
{
- name: 'CentCom',
+ name: 'NT-CC',
freq: 1337,
color: '#2681a5',
},
{
- name: 'Supply',
+ name: 'SolCon',
+ freq: 1345,
+ color: '#7589af',
+ },
+ {
+ name: 'IRMG',
freq: 1347,
color: '#b88646',
},
{
- name: 'Service',
+ name: 'PGF',
freq: 1349,
- color: '#6ca729',
+ color: '#199943',
},
{
- name: 'Science',
+ name: 'Nanotrasen',
freq: 1351,
color: '#c68cfa',
},
{
- name: 'Command',
+ name: 'Emergency',
freq: 1353,
- color: '#fcdf03',
+ color: '#dd3535',
},
{
- name: 'Medical',
+ name: 'CLIP-CMM',
freq: 1355,
color: '#57b8f0',
},
{
- name: 'Engineering',
- freq: 1357,
- color: '#f37746',
- },
- {
- name: 'Security',
+ name: 'Unidentified',
freq: 1359,
- color: '#dd3535',
- },
- {
- name: 'AI Private',
- freq: 1447,
- color: '#d65d95',
+ color: '#fcdf03',
},
{
name: 'Common',
freq: 1459,
color: '#1ecc43',
},
+ {
+ name: 'Wideband',
+ freq: 1501,
+ color: '#8de7b6',
+ },
] as const;
const GASES = [
From a3f476ebf5c8ef7335797637070465f14e6e4ca2 Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:22:24 -0800
Subject: [PATCH 2/5] fuck radio duffels. you know who you are.
---
code/__DEFINES/radio.dm | 6 +++---
tgui/packages/tgui/constants.ts | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
index 0c5c92d419ca..2a999e199941 100644
--- a/code/__DEFINES/radio.dm
+++ b/code/__DEFINES/radio.dm
@@ -75,11 +75,11 @@
#define FREQ_SIGNALER 1457 // the default for new signalers
#define FREQ_COMMON 1459 // Common comms frequency, dark green
-#define MAX_FREQ 1489 // ------------------------------------------------------
+#define MAX_FREQ 1689 // ------------------------------------------------------
-#define FREQ_WIDEBAND 1501 // sector wide communication
+#define FREQ_WIDEBAND 1691 // sector wide communication
-#define MAX_FREE_FREQ 1599 // -------------------------------------------------
+#define MAX_FREE_FREQ 1699 // -------------------------------------------------
// Transmission types.
#define TRANSMISSION_WIRE 0 // some sort of wired connection, not used
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index 98636319c88d..04157b399a01 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -141,7 +141,7 @@ export const RADIO_CHANNELS = [
},
{
name: 'Wideband',
- freq: 1501,
+ freq: 1681,
color: '#8de7b6',
},
] as const;
From 5428557de33916524eab26d157c7fbb0413c6370 Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:28:31 -0800
Subject: [PATCH 3/5] updates a comment
---
code/__DEFINES/radio.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
index 2a999e199941..af9983bff22e 100644
--- a/code/__DEFINES/radio.dm
+++ b/code/__DEFINES/radio.dm
@@ -62,8 +62,7 @@
#define FREQ_ATMOS_CONTROL 1439 // air alarms <-> vents and scrubbers
#define MIN_FREQ 1441 // ------------------------------------------------------
-// Only the 1441 to 1489 range is freely available for general conversation.
-// This represents 1/8th of the available spectrum.
+// Only the 1441 to 1689 range is freely available for general conversation.
#define FREQ_ATMOS_STORAGE 1441
#define FREQ_NAV_BEACON 1445
From c912fdc5e83553cabe9772ef0ac4b05e0ec1ec90 Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Tue, 26 Nov 2024 01:14:50 -0800
Subject: [PATCH 4/5] CMM
---
tgui/packages/tgui/constants.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index 04157b399a01..48d18f10d0fa 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -125,7 +125,7 @@ export const RADIO_CHANNELS = [
color: '#dd3535',
},
{
- name: 'CLIP-CMM',
+ name: 'CMM',
freq: 1355,
color: '#57b8f0',
},
From c4e6fbc740e0073796e71bdd7d565b2cd5e8260c Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Tue, 26 Nov 2024 01:15:06 -0800
Subject: [PATCH 5/5] CLIP-CMM -> Minutemen
---
tgui/packages/tgui/constants.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index 48d18f10d0fa..9ce78db78652 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -125,7 +125,7 @@ export const RADIO_CHANNELS = [
color: '#dd3535',
},
{
- name: 'CMM',
+ name: 'Minutemen',
freq: 1355,
color: '#57b8f0',
},