diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index c0cf15616f..66468a516c 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -164,7 +164,7 @@ radio_controller.remove_object(src, frequency) frequency = new_frequency if(frequency) - radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA) + radio_connection = radio_controller.add_object(src, frequency, radio_filter = RADIO_ATMOSIA) /obj/machinery/atmospherics/binary/dp_vent_pump/proc/broadcast_status() if(!radio_connection) @@ -185,7 +185,7 @@ "external" = external_pressure_bound, "sigtype" = "status" ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) return 1 diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index 531e9b7af2..4b56d94f0d 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -5,13 +5,13 @@ Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. procs: - add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) + add_object(obj/device as obj, var/new_frequency as num, var/radio_filter as text|null = null) Adds listening object. parameters: device - device receiving signals, must have proc receive_signal (see description below). one device may listen several frequencies, but not same frequency twice. new_frequency - see possibly frequencies below; - filter - thing for optimization. Optional, but recommended. + radio_filter - thing for optimization. Optional, but recommended. All filters should be consolidated in this file, see defines later. Device without listening filter will receive all signals (on specified frequency). Device with filter will receive any signals sent without filter. @@ -30,12 +30,12 @@ radio_frequency is a global object maintaining list of devices that listening specific frequency. procs: - post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) + post_signal(obj/source as obj|null, datum/signal/signal, var/radio_filter as text|null = null, var/range as num|null = null) Sends signal to all devices that wants such signal. parameters: source - object, emitted signal. Usually, devices will not receive their own signals. signal - see description below. - filter - described above. + radio_filter - described above. range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 546e6acd88..ac1e21051a 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -56,7 +56,7 @@ signal.data["nitrogen"] = 0 signal.data["carbon_dioxide"] = 0 signal.data["sigtype"]="status" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) /obj/machinery/air_sensor/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) @@ -239,7 +239,7 @@ obj/machinery/computer/general_air_control/Destroy() . = 1 signal.data["sigtype"]="command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) /obj/machinery/computer/general_air_control/supermatter_core icon = 'icons/obj/computer.dmi' @@ -349,7 +349,7 @@ obj/machinery/computer/general_air_control/Destroy() . = 1 signal.data["sigtype"]="command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) /obj/machinery/computer/general_air_control/fuel_injection icon = 'icons/obj/computer.dmi' @@ -386,7 +386,7 @@ obj/machinery/computer/general_air_control/Destroy() "sigtype"="command" ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) ..() @@ -446,7 +446,7 @@ obj/machinery/computer/general_air_control/Destroy() "status" = 1, "sigtype"="command" ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) if(href_list["toggle_automation"]) automation = !automation @@ -465,7 +465,7 @@ obj/machinery/computer/general_air_control/Destroy() "sigtype"="command" ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) if(href_list["injection"]) if(!radio_connection) @@ -480,4 +480,4 @@ obj/machinery/computer/general_air_control/Destroy() "sigtype"="command" ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) \ No newline at end of file + radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA) \ No newline at end of file diff --git a/code/game/machinery/computer3/networking.dm b/code/game/machinery/computer3/networking.dm index 66d25dda5a..f88d8a4837 100644 --- a/code/game/machinery/computer3/networking.dm +++ b/code/game/machinery/computer3/networking.dm @@ -65,20 +65,20 @@ var/datum/radio_frequency/radio_connection = null var/frequency = PUB_FREQ - var/filter = null + var/rad_filter = null var/range = null var/subspace = 0 init() ..() spawn(5) - radio_connection = radio_controller.add_object(src, src.frequency, src.filter) + radio_connection = radio_controller.add_object(src, src.frequency, src.rad_filter) proc/set_frequency(new_frequency) if(radio_controller) radio_controller.remove_object(src, frequency) frequency = new_frequency - radio_connection = radio_controller.add_object(src, frequency, filter) + radio_connection = radio_controller.add_object(src, frequency, rad_filter) else frequency = new_frequency spawn(rand(5,10)) @@ -94,7 +94,7 @@ if(!computer || (computer.stat&~MAINT) || !computer.program) return if(!radio_connection) return - radio_connection.post_signal(src,signal,filter,range) + radio_connection.post_signal(src,signal,rad_filter,range) get_machines(var/typekey) if(!radio_connection || !radio_connection.frequency) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index ba8aa85b2c..c87e78cfd5 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -101,7 +101,7 @@ obj/machinery/door/airlock/proc/send_status(var/bumped = 0) if (bumped) signal.data["bumped_with_access"] = 1 - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) obj/machinery/door/airlock/open(surpress_send) @@ -181,7 +181,7 @@ obj/machinery/airlock_sensor/attack_hand(mob/user) signal.data["tag"] = master_tag signal.data["command"] = command - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) obj/machinery/airlock_sensor/process() @@ -196,7 +196,7 @@ obj/machinery/airlock_sensor/process() signal.data["timestamp"] = world.time signal.data["pressure"] = num2text(pressure) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) previousPressure = pressure @@ -269,7 +269,7 @@ obj/machinery/access_button/attack_hand(mob/user) signal.data["tag"] = master_tag signal.data["command"] = command - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) flick("access_button_cycle", src) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index a128e6c4e4..5a6b77931f 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -69,11 +69,11 @@ obj/machinery/embedded_controller/radio/Destroy() else icon_state = "airlock_control_off" -/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, var/filter = null) +/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, var/radio_filter = null) signal.transmission_method = TRANSMISSION_RADIO if(radio_connection) //use_power(radio_power_use) //neat idea, but causes way too much lag. - return radio_connection.post_signal(src, signal, filter) + return radio_connection.post_signal(src, signal, radio_filter) else qdel(signal) diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 019425db0e..9de35c2582 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -29,7 +29,7 @@ if(key3) signal.data[key3] = value3 - frequency.post_signal(src, signal, filter = s_filter) + frequency.post_signal(src, signal, radio_filter = s_filter) return @@ -47,7 +47,7 @@ ..() spawn(5) if(radio_controller) - radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT) + radio_controller.add_object(src, control_freq, radio_filter = RADIO_SECBOT) // receive radio signals // can detect bot status signals