cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

SScommunications

Browse Source
This commit is contained in:
AffectedArc07
2019-04-21 19:28:41 +01:00
parent a0581c314a
commit ff78ff1a9c
42 changed files with 447 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/cart_apps.dm
+1 -1
View File
@@ -28,7 +28,7 @@
post_status(href_list["statdisp"])
/datum/data/pda/app/status_display/proc/post_status(var/command, var/data1, var/data2)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(DISPLAY_FREQ)
var/datum/radio_frequency/frequency = SSradio.return_frequency(DISPLAY_FREQ)
if(!frequency)
return
code/modules/pda/radio.dm
+10 -10
View File
@@ -26,15 +26,15 @@
add_to_radio(bot_filter)
/obj/item/integrated_radio/Destroy()
if(radio_controller)
radio_controller.remove_object(src, control_freq)
if(SSradio)
SSradio.remove_object(src, control_freq)
hostpda = null
return ..()
/obj/item/integrated_radio/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter)
// to_chat(world, "Post: [freq]: [key]=[value], [key2]=[value2]")
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
var/datum/radio_frequency/frequency = SSradio.return_frequency(freq)
if(!frequency)
return
@@ -93,8 +93,8 @@
post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
/obj/item/integrated_radio/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
if(radio_controller)
radio_controller.add_object(src, control_freq, filter = bot_filter)
if(SSradio)
SSradio.add_object(src, control_freq, filter = bot_filter)
/obj/item/integrated_radio/honkbot
bot_filter = RADIO_HONKBOT
@@ -171,13 +171,13 @@
var/datum/radio_frequency/radio_connection
/obj/item/integrated_radio/signal/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
/obj/item/integrated_radio/signal/Initialize()
if(!radio_controller)
if(!SSradio)
return
if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
src.frequency = sanitize_frequency(src.frequency)
@@ -185,9 +185,9 @@
set_frequency(frequency)
/obj/item/integrated_radio/signal/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency)
radio_connection = SSradio.add_object(src, frequency)
/obj/item/integrated_radio/signal/proc/send_signal(message="ACTIVATE")