From 623efa69d734a1c81845f6bb2e38bdcb322a45fd Mon Sep 17 00:00:00 2001 From: BluBerry016 <50649185+unit0016@users.noreply.github.com> Date: Fri, 23 Apr 2021 16:45:50 -0400 Subject: [PATCH] AAAAAA (#5014) --- code/__DEFINES/~skyrat_defines/assaultops.dm | 5 +++++ code/game/communications.dm | 2 ++ code/game/objects/items/devices/radio/radio.dm | 2 +- code/game/say.dm | 1 + code/modules/mob/living/living_say.dm | 1 + tgstation.dme | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 code/__DEFINES/~skyrat_defines/assaultops.dm diff --git a/code/__DEFINES/~skyrat_defines/assaultops.dm b/code/__DEFINES/~skyrat_defines/assaultops.dm new file mode 100644 index 00000000000..fd6cffcf564 --- /dev/null +++ b/code/__DEFINES/~skyrat_defines/assaultops.dm @@ -0,0 +1,5 @@ +#define RADIO_CHANNEL_ASSAULT "DS-1" +#define RADIO_KEY_ASSAULT "z" +#define RADIO_TOKEN_ASSAULT ":z" + +#define FREQ_ASSAULT 1207 diff --git a/code/game/communications.dm b/code/game/communications.dm index 4c86e1842b1..b30df3e119c 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -101,6 +101,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_FACTION = FREQ_FACTION, //SKYRAT EDIT ADDITION - FACTION RADIO_CHANNEL_CYBERSUN = FREQ_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING RADIO_CHANNEL_INTERDYNE = FREQ_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING + RADIO_CHANNEL_ASSAULT = FREQ_ASSAULT, //SKYRAT EDIT ADDITION - ASSAULT OPS RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE, RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY, RADIO_CHANNEL_SERVICE = FREQ_SERVICE, @@ -122,6 +123,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_FACTION]" = RADIO_CHANNEL_FACTION, //SKYRAT EDIT ADDITION - FACTION "[FREQ_CYBERSUN]" = RADIO_CHANNEL_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING "[FREQ_INTERDYNE]" = RADIO_CHANNEL_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING + "[FREQ_ASSAULT]" = RADIO_CHANNEL_ASSAULT, //SKYRAT EDIT ADDITION - ASSAULT OPS "[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE, "[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY, "[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE, diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 9eb042232cb..535ffef116e 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -264,7 +264,7 @@ // Independent radios, on the CentCom frequency, reach all independent radios //if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW)) ORIGINAL - if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, ASSAULT OPS + if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_ASSAULT)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, ASSAULT OPS signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.levels = list(0) // reaches all Z-levels diff --git a/code/game/say.dm b/code/game/say.dm index 39bdb0c5aef..ee07e1e39c4 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_FACTION]" = "suppradio", //SKYRAT EDIT ADDITIION - FACTION "[FREQ_CYBERSUN]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING "[FREQ_INTERDYNE]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING + "[FREQ_ASSAULT]" = "syndradio", //SKYRAT EDIT ADDITION - ASSAULT OPS "[FREQ_CTF_RED]" = "redteamradio", "[FREQ_CTF_BLUE]" = "blueteamradio", "[FREQ_CTF_GREEN]" = "greenteamradio", diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 07b5b26c29f..5a3e2c17895 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( RADIO_KEY_FACTION = RADIO_CHANNEL_FACTION, //SKYRAT EDIT ADDITION - FACTION RADIO_KEY_CYBERSUN = RADIO_CHANNEL_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING RADIO_KEY_INTERDYNE = RADIO_CHANNEL_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING + RADIO_KEY_ASSAULT = RADIO_CHANNEL_ASSAULT, //SKYRAT EDIT ADDITION - MAPPING // Admin MODE_KEY_ADMIN = MODE_ADMIN, diff --git a/tgstation.dme b/tgstation.dme index be1eb4c837f..3c1f8920210 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -151,6 +151,7 @@ #include "code\__DEFINES\research\anomalies.dm" #include "code\__DEFINES\~skyrat_defines\ambitions.dm" #include "code\__DEFINES\~skyrat_defines\ammo_defines.dm" +#include "code\__DEFINES\~skyrat_defines\assaultops.dm" #include "code\__DEFINES\~skyrat_defines\banning.dm" #include "code\__DEFINES\~skyrat_defines\cells.dm" #include "code\__DEFINES\~skyrat_defines\combat.dm"