cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +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/admin/verbs/diagnostics.dm
+2 -2
View File
@@ -83,9 +83,9 @@
"_default" = "NO_FILTER"
)
var/output = "<b>Radio Report</b><hr>"
for(var/fq in radio_controller.frequencies)
for(var/fq in SSradio.frequencies)
output += "<b>Freq: [fq]</b><br>"
var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
var/list/datum/radio_frequency/fqs = SSradio.frequencies[fq]
if(!fqs)
output += "&nbsp;&nbsp;<b>ERROR</b><br>"
continue
code/modules/assembly/signaler.dm
+8 -8
View File
@@ -20,17 +20,17 @@
/obj/item/assembly/signaler/New()
..()
if(radio_controller)
if(SSradio)
set_frequency(frequency)
/obj/item/assembly/signaler/Initialize()
..()
if(radio_controller)
if(SSradio)
set_frequency(frequency)
/obj/item/assembly/signaler/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
@@ -151,13 +151,13 @@
return TRUE
/obj/item/assembly/signaler/proc/set_frequency(new_frequency)
if(!radio_controller)
if(!SSradio)
sleep(20)
if(!radio_controller)
if(!SSradio)
return
radio_controller.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT)
// Embedded signaller used in anomalies.
/obj/item/assembly/signaler/anomaly
code/modules/flufftext/Hallucination.dm
+1 -1
View File
@@ -738,7 +738,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
humans += H
person = pick(humans)
target.hear_radio(message_to_multilingual(pick(radio_messages), pick(person.languages)), speaker = person, part_a = "<span class='[frequency_span_class(PUB_FREQ)]'><b>\[[get_frequency_name(PUB_FREQ)]\]</b> <span class='name'>", part_b = "</span> <span class='message'>")
target.hear_radio(message_to_multilingual(pick(radio_messages), pick(person.languages)), speaker = person, part_a = "<span class='[SSradio.frequency_span_class(PUB_FREQ)]'><b>\[[get_frequency_name(PUB_FREQ)]\]</b> <span class='name'>", part_b = "</span> <span class='message'>")
qdel(src)
/obj/effect/hallucination/message
code/modules/logic/logic_base.dm
+5 -5
View File
@@ -42,7 +42,7 @@
if(tamperproof) //doing this during New so we don't have to worry about forgetting to set these vars during editting / defining
unacidable = 1
..()
if(radio_controller)
if(SSradio)
set_frequency(frequency)
component_parts = list()
var/obj/item/circuitboard/logic_gate/LG = new(null)
@@ -55,14 +55,14 @@
set_frequency(frequency)
/obj/machinery/logic_gate/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_LOGIC)
radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC)
return
/obj/machinery/logic_gate/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
code/modules/mob/living/simple_animal/bot/bot.dm
+5 -5
View File
@@ -156,8 +156,8 @@
bot_core = new bot_core_type(src)
spawn(30)
if(radio_controller && bot_filter)
radio_controller.add_object(bot_core, control_freq, bot_filter)
if(SSradio && bot_filter)
SSradio.add_object(bot_core, control_freq, bot_filter)
prepare_huds()
for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
@@ -197,8 +197,8 @@
if(reset_access_timer_id)
deltimer(reset_access_timer_id)
reset_access_timer_id = null
if(radio_controller && bot_filter)
radio_controller.remove_object(bot_core, control_freq)
if(SSradio && bot_filter)
SSradio.remove_object(bot_core, control_freq)
QDEL_NULL(bot_core)
return ..()
@@ -747,7 +747,7 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
if(z != 1) //Bot control will only work on station.
return
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
var/datum/radio_frequency/frequency = SSradio.return_frequency(freq)
if(!frequency)
return
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")
code/modules/power/singularity/emitter.dm
+4 -4
View File
@@ -54,10 +54,10 @@
//Radio remote control
/obj/machinery/power/emitter/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/power/emitter/verb/rotate()
@@ -121,8 +121,8 @@
update_icon()
/obj/machinery/power/emitter/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])", ATKLOG_FEW)
log_game("Emitter deleted at ([x],[y],[z])")
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -739,7 +739,7 @@
return 1
/obj/machinery/computer/supplycomp/proc/post_signal(var/command)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(DISPLAY_FREQ)
var/datum/radio_frequency/frequency = SSradio.return_frequency(DISPLAY_FREQ)
if(!frequency) return