cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 19:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.

Browse Source
This commit is contained in:
PsiOmega
2015-09-03 09:01:36 +02:00
parent 52eae80d74
commit e5aa095f09
7 changed files with 104 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+5 -1
View File
@@ -19,6 +19,7 @@
/obj/item/device/radio/headset/New()
..()
internal_channels.Cut()
if(ks1type)
keyslot1 = new ks1type(src)
if(ks2type)
@@ -32,11 +33,14 @@
keyslot2 = null
..()
/obj/item/device/radio/headset/list_channels(var/mob/user)
return list_secure_channels()
/obj/item/device/radio/headset/examine(mob/user)
if(!(..(user, 1) && radio_desc))
return
user << "The following channels are built-in:"
user << "The following channels are available:"
user << radio_desc
/obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel)
code/game/objects/items/devices/radio/intercom.dm
+3 -56
View File
@@ -1,17 +1,3 @@
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
var/global/list/default_intercom_channels = list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics)
)
/obj/item/device/radio/intercom
name = "station intercom (General)"
desc = "Talk through this."
@@ -23,8 +9,6 @@ var/global/list/default_intercom_channels = list(
var/number = 0
var/last_tick //used to delay the powercheck
var/list/intercom_channels
/obj/item/device/radio/intercom/custom
name = "station intercom (Custom)"
broadcasting = 0
@@ -58,18 +42,14 @@ var/global/list/default_intercom_channels = list(
/obj/item/device/radio/intercom/New()
..()
processing_objects += src
intercom_channels = default_intercom_channels.Copy()
/obj/item/device/radio/intercom/department/medbay/New()
..()
intercom_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_I_FREQ) = list(access_medical_equip)
)
internal_channels = default_medbay_channels.Copy()
/obj/item/device/radio/intercom/department/security/New()
..()
intercom_channels = list(
internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(SEC_I_FREQ) = list(access_security)
)
@@ -83,17 +63,7 @@ var/global/list/default_intercom_channels = list(
/obj/item/device/radio/intercom/syndicate/New()
..()
intercom_channels[num2text(SYND_FREQ)] = list(access_syndicate)
/obj/item/device/radio/intercom/proc/has_channel_access(var/mob/user, var/freq)
if(!user)
return 0
if(!(freq in intercom_channels))
return 0
var/obj/item/weapon/card/id/I = user.GetIdCard()
return has_access(list(), intercom_channels[freq], I ? I.GetAccess() : list())
internal_channels[num2text(SYND_FREQ)] = list(access_syndicate)
/obj/item/device/radio/intercom/Destroy()
processing_objects -= src
@@ -109,16 +79,6 @@ var/global/list/default_intercom_channels = list(
spawn (0)
attack_self(user)
/obj/item/device/radio/intercom/list_channels(var/mob/user)
var/dat = ""
for (var/priv_chan in intercom_channels)
if(has_channel_access(user, priv_chan))
dat+="<A href='byond://?src=\ref[src];spec_freq=[priv_chan]'>[get_frequency_name(text2num(priv_chan))]</A><br>"
if(dat)
dat = "<br><b>Available Channels</b><br>" + dat
return dat
/obj/item/device/radio/intercom/receive_range(freq, level)
if (!on)
return -1
@@ -152,19 +112,6 @@ var/global/list/default_intercom_channels = list(
else
icon_state = "intercom"
/obj/item/device/radio/intercom/Topic(href, href_list)
if(..())
return 1
if(href_list["spec_freq"])
var freq = href_list["spec_freq"]
if(has_channel_access(usr, freq))
set_frequency(text2num(freq))
. = 1
if(.)
interact(usr)
/obj/item/device/radio/intercom/locked
var/locked_frequency
code/game/objects/items/devices/radio/radio.dm
+70 -3
View File
@@ -1,3 +1,25 @@
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
var/global/list/default_internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ)=list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics)
)
var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ) = list(access_medical_equip)
)
/obj/item/device/radio
icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
@@ -15,10 +37,9 @@
var/b_stat = 0
var/broadcasting = 0
var/listening = 1
var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
var/list/channels = list() //see communications.dm for full list. First channel is a "default" for :h
var/subspace_transmission = 0
var/syndie = 0//Holder to see if it's a syndicate encrypted radio
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING
flags = CONDUCT
slot_flags = SLOT_BELT
throw_speed = 2
@@ -27,7 +48,7 @@
matter = list("glass" = 25,DEFAULT_WALL_MATERIAL = 75)
var/const/FREQ_LISTENING = 1
var/list/internal_channels
/obj/item/device/radio
var/datum/radio_frequency/radio_connection
@@ -41,6 +62,7 @@
/obj/item/device/radio/New()
..()
wires = new(src)
internal_channels = default_internal_channels.Copy()
/obj/item/device/radio/Destroy()
qdel(wires)
@@ -96,11 +118,34 @@
return
/obj/item/device/radio/proc/list_channels(var/mob/user)
return list_internal_channels(user)
/obj/item/device/radio/proc/list_secure_channels(var/mob/user)
var/dat = ""
for (var/ch_name in channels)
dat+=text_sec_channel(ch_name, channels[ch_name])
return dat
/obj/item/device/radio/proc/list_internal_channels(var/mob/user)
var/dat = ""
for (var/internal_chan in internal_channels)
if(has_channel_access(user, internal_chan))
dat+="<A href='byond://?src=\ref[src];spec_freq=[internal_chan]'>[get_frequency_name(text2num(internal_chan))]</A><br>"
if(dat)
dat = "<br><b>Internal Channels</b><br>" + dat
return dat
/obj/item/device/radio/proc/has_channel_access(var/mob/user, var/freq)
if(!user)
return 0
if(!(freq in internal_channels))
return 0
var/obj/item/weapon/card/id/I = user.GetIdCard()
return has_access(list(), internal_channels[freq], I ? I.GetAccess() : list())
/obj/item/device/radio/proc/text_wires()
if (b_stat)
return wires.GetInteractWindow()
@@ -155,6 +200,11 @@
else
channels[chan_name] |= FREQ_LISTENING
. = 1
else if(href_list["spec_freq"])
var freq = href_list["spec_freq"]
if(has_channel_access(usr, freq))
set_frequency(text2num(freq))
. = 1
if(href_list["nowindow"]) // here for pAIs, maybe others will want it, idk
return 1
@@ -513,6 +563,9 @@
myborg = null
return ..()
/obj/item/device/radio/borg/list_channels(var/mob/user)
return list_secure_channels(user)
/obj/item/device/radio/borg/talk_into()
. = ..()
if (isrobot(src.loc))
@@ -662,3 +715,17 @@
/obj/item/device/radio/off
listening = 0
/obj/item/device/radio/phone
broadcasting = 0
icon = 'icons/obj/items.dmi'
icon_state = "red_phone"
listening = 1
name = "phone"
/obj/item/device/radio/phone/medbay
frequency = MED_I_FREQ
/obj/item/device/radio/phone/medbay/New()
..()
internal_channels = default_medbay_channels.Copy()