cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Oversight radio to Magistrate, AI, Captain, NT Rep, and IAA

Browse Source
This commit is contained in:
warior4356
2020-09-29 23:21:27 -07:00
parent 27708aded2
commit dbd9ea7be5
10 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/radio.dm
+1 -1
View File
@@ -22,7 +22,7 @@
#define AI_FREQ 1343
#define ERT_FREQ 1345
#define COMM_FREQ 1353 //Command
#define CORP_FREQ 1339 //Corporate
#define OVER_FREQ 1339 //Oversight
#define BOT_FREQ 1447 //mulebot, secbot, ed209
code/controllers/subsystem/radio.dm
+4 -1
View File
@@ -6,6 +6,7 @@ SUBSYSTEM_DEF(radio)
"Common" = PUB_FREQ,
"Science" = SCI_FREQ,
"Command" = COMM_FREQ,
"Oversight" = OVER_FREQ,
"Medical" = MED_FREQ,
"Engineering" = ENG_FREQ,
"Security" = SEC_FREQ,
@@ -21,7 +22,7 @@ SUBSYSTEM_DEF(radio)
)
var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
var/list/ANTAG_FREQS = list(SYND_FREQ, SYNDTEAM_FREQ)
var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)
var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ, OVER_FREQ)
var/list/datum/radio_frequency/frequencies = list()
// This is fucking disgusting and needs to die
@@ -50,6 +51,8 @@ SUBSYSTEM_DEF(radio)
return "supradio"
if(SRV_FREQ)
return "srvradio"
if(OVER_FREQ)
return "overadio"
// If the above switch somehow failed. And it needs the SSradio. part otherwise it fails to compile
if(frequency in DEPT_FREQS)
code/game/jobs/job/supervisor.dm
+1 -1
View File
@@ -261,7 +261,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/internalaffairs
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/radio/headset/headset_sec/alt
l_ear = /obj/item/radio/headset/headset_iaa
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
id = /obj/item/card/id/security
l_pocket = /obj/item/laser_pointer
code/game/objects/items/devices/radio/encryptionkey.dm
+11 -6
View File
@@ -55,6 +55,11 @@
icon_state = "sec_cypherkey"
channels = list("Security" = 1)
/obj/item/encryptionkey/headset_iaa
name = "IAA Radio Encryption Key"
icon_state = "sec_cypherkey"
channels = list("Security" = 1, "Oversight" = 1)
/obj/item/encryptionkey/headset_eng
name = "Engineering Radio Encryption Key"
icon_state = "eng_cypherkey"
@@ -88,7 +93,7 @@
/obj/item/encryptionkey/heads/captain
name = "Captain's Encryption Key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Oversight" = 0)
/obj/item/encryptionkey/heads/rd
name = "Research Director's Encryption Key"
@@ -118,12 +123,12 @@
/obj/item/encryptionkey/heads/ntrep
name = "Nanotrasen Representative's Encryption Key"
icon_state = "com_cypherkey"
channels = list("Command" = 1, "Security" = 0, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)
channels = list("Command" = 1, "Security" = 0, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Oversight" = 1)
/obj/item/encryptionkey/heads/magistrate
name = "Magistrate's Encryption Key"
icon_state = "com_cypherkey"
channels = list("Command" = 1, "Security" = 1)
channels = list("Command" = 1, "Security" = 1, "Oversight" = 1)
/obj/item/encryptionkey/heads/blueshield
name = "Blueshield's Encryption Key"
@@ -153,14 +158,14 @@
/obj/item/encryptionkey/ert
name = "Nanotrasen ERT Radio Encryption Key"
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Oversight" = 1)
/obj/item/encryptionkey/centcom
name = "Centcom Radio Encryption Key"
channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Oversight" = 1)
/obj/item/encryptionkey/heads/ai_integrated //ported from bay, this goes 'inside' the AI.
name = "AI Integrated Encryption Key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Oversight" = 1)
code/game/objects/items/devices/radio/headset.dm
+8
View File
@@ -128,6 +128,14 @@
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
/obj/item/radio/headset/headset_iaa
name = "internal affairs bowman headset"
desc = "This is used by your elite legal team. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
ks2type = /obj/item/encryptionkey/headset_iaa
/obj/item/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
code/modules/mob/living/say.dm
+2 -2
View File
@@ -7,7 +7,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
":c" = "Command", "#c" = "Command", ".c" = "Command",
":n" = "Science", "#n" = "Science", ".n" = "Science",
":m" = "Medical", "#m" = "Medical", ".m" = "Medical",
":o" = "Corporate", "#o" = "Corporate", ".o" = "Corporate",
":o" = "Oversight", "#o" = "Oversight", ".o" = "Oversight",
":e" = "Engineering", "#e" = "Engineering", ".e" = "Engineering",
":s" = "Security", "#s" = "Security", ".s" = "Security",
":w" = "whisper", "#w" = "whisper", ".w" = "whisper",
@@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
":C" = "Command", "#C" = "Command", ".C" = "Command",
":N" = "Science", "#N" = "Science", ".N" = "Science",
":M" = "Medical", "#M" = "Medical", ".M" = "Medical",
":O" = "Corporate", "#O" = "Corporate", ".O" = "Corporate",
":O" = "Oversight", "#O" = "Oversight", ".O" = "Oversight",
":E" = "Engineering", "#E" = "Engineering", ".E" = "Engineering",
":S" = "Security", "#S" = "Security", ".S" = "Security",
":W" = "whisper", "#W" = "whisper", ".W" = "whisper",
goon/browserassets/css/browserOutput-dark.css
+1
View File
@@ -282,6 +282,7 @@ em {font-style: normal; font-weight: bold;}
.sciradio {color: #993399;}
.supradio {color: #9F8545;}
.srvradio {color: #80A000;}
.overadio {color: #4e3b25;}
.admin_channel {color: #fcba03; font-weight: bold;}
.mentor_channel {color: #775BFF; font-weight: bold;}
.mentor_channel_admin {color: #A35CFF; font-weight: bold;}
goon/browserassets/css/browserOutput.css
+1
View File
@@ -279,6 +279,7 @@ em {font-style: normal; font-weight: bold;}
.sciradio {color: #993399;}
.supradio {color: #7F6539;}
.srvradio {color: #80A000;}
.overadio {color: #4e3b25;}
.admin_channel {color: #9A04D1; font-weight: bold;}
.mentor_channel {color: #775BFF; font-weight: bold;}
.mentor_channel_admin {color: #A35CFF; font-weight: bold;}
tgui/packages/tgui/constants.js
+5
View File
@@ -99,6 +99,11 @@ export const RADIO_CHANNELS = [
freq: 1353,
color: '#5177ff',
},
{
name: 'Oversight',
freq: 1339,
color: '#4e3b25',
},
{
name: 'Medical',
freq: 1355,
tgui/packages/tgui/public/tgui.bundle.js
+1 -1
View File
File diff suppressed because one or more lines are too long