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

Merge pull request #3153 from VOREStation/aro-convo

Browse Source 
Adds 'Intercom Convo' verb
This commit is contained in:
Aronai Sieyes
2018-02-27 21:48:39 -05:00
committed by GitHub
parent aa634a71c5 0c4cc6811a
commit dcc02e5090
7 changed files with 104 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/intercom.dm
+6
View File
@@ -50,6 +50,12 @@
name = "entertainment intercom"
frequency = ENT_FREQ
/obj/item/device/radio/intercom/omni
name = "global announcer"
/obj/item/device/radio/intercom/omni/initialize()
channels = radiochannels.Copy()
return ..()
/obj/item/device/radio/intercom/New()
..()
processing_objects += src
code/game/objects/items/devices/radio/radio.dm
+4 -5
View File
@@ -53,14 +53,13 @@ var/global/list/default_medbay_channels = list(
var/const/FREQ_LISTENING = 1
var/list/internal_channels
/obj/item/device/radio
var/datum/radio_frequency/radio_connection
var/list/datum/radio_frequency/secure_radio_connections = new
proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
/obj/item/device/radio/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
/obj/item/device/radio/New()
..()