diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index b9902dbb066..9be950ddd08 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -162,7 +162,7 @@ return 1 //Radio remote control -/obj/machinery/atmospherics/binary/dp_vent_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/binary/dp_vent_pump/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 3448655c953..b255e2836c9 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -70,7 +70,7 @@ return 1 //Radio remote control -/obj/machinery/atmospherics/binary/passive_gate/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/binary/passive_gate/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 1998e67e17d..b2a7d0948be 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -121,7 +121,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 //Radio remote control -/obj/machinery/atmospherics/binary/pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/binary/pump/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index 0f36a749722..d94e520d20d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -105,7 +105,7 @@ if(!powered()) icon_state = "valve[open]nopower" -/obj/machinery/atmospherics/binary/valve/digital/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/binary/valve/digital/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 0947b2ee860..6dab5ddd441 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -123,7 +123,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/volume_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/binary/volume_pump/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index e45a8c3956f..174c77f6753 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -72,7 +72,7 @@ Filter types: icon_state = "mmap" flipped = 1 -/obj/machinery/atmospherics/trinary/filter/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/trinary/filter/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm index 7b3f8299339..9bf5baa37e5 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm @@ -151,7 +151,7 @@ ..() //Radio remote control -/obj/machinery/atmospherics/trinary/tvalve/digital/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/trinary/tvalve/digital/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index a312a28b36e..d9f6f569b32 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -98,11 +98,11 @@ flick("inject", src) -/obj/machinery/atmospherics/unary/outlet_injector/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/unary/outlet_injector/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) - radio_connection = SSradio.add_object(src, frequency) + radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) /obj/machinery/atmospherics/unary/outlet_injector/proc/broadcast_status() if(!radio_connection) @@ -120,7 +120,7 @@ "sigtype" = "status" ) - radio_connection.post_signal(src, signal) + radio_connection.post_signal(src, signal, RADIO_ATMOSIA) return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 1b920002227..a3a7b21bdd0 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -192,7 +192,7 @@ //Radio remote control -/obj/machinery/atmospherics/unary/vent_pump/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/unary/vent_pump/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 5fcf7817a30..25227f5c21c 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -136,7 +136,7 @@ else add_underlay(T,, dir) -/obj/machinery/atmospherics/unary/vent_scrubber/proc/set_frequency(new_frequency) +/obj/machinery/atmospherics/unary/vent_scrubber/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, radio_filter_in) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index d13406eee99..790524583d4 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -401,7 +401,7 @@ continue send_signal(id_tag, list("status") ) -/obj/machinery/alarm/proc/set_frequency(new_frequency) +/obj/machinery/alarm/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_TO_AIRALARM) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index f0c6a81820f..6d54135946b 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -121,7 +121,7 @@ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) -/obj/machinery/air_sensor/proc/set_frequency(new_frequency) +/obj/machinery/air_sensor/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) @@ -268,7 +268,7 @@ return output -/obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) +/obj/machinery/computer/general_air_control/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) @@ -407,6 +407,7 @@ /obj/machinery/computer/general_air_control/large_tank_control/linkWith(mob/user, obj/O, list/context) if(context["slot"]=="input" && is_type_in_list(O,input_linkable)) + input_tag = O:id_tag input_info = null if(istype(O,/obj/machinery/atmospherics/unary/vent_pump)) send_signal(list("tag"=input_tag, diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index f91152b47e4..92b7cf8ca54 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -45,7 +45,7 @@ ..() set_frequency(frequency) -/obj/machinery/driver_button/proc/set_frequency(new_frequency) +/obj/machinery/driver_button/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 8113a9caace..29c76cc0754 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -125,7 +125,7 @@ send_status(1) return -/obj/machinery/door/airlock/proc/set_frequency(new_frequency) +/obj/machinery/door/airlock/set_frequency(new_frequency) SSradio.remove_object(src, frequency) if(new_frequency) frequency = new_frequency @@ -202,7 +202,7 @@ update_icon() -/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) +/obj/machinery/airlock_sensor/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) @@ -275,7 +275,7 @@ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) flick("access_button_cycle", src) -/obj/machinery/access_button/proc/set_frequency(new_frequency) +/obj/machinery/access_button/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 62fbae71c78..ef5adee8971 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -81,7 +81,7 @@ else qdel(signal) -/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) +/obj/machinery/embedded_controller/radio/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, radio_filter) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 4d27ad6b5b5..d06dc5e7d88 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -48,7 +48,7 @@ ..() set_frequency(frequency) -/obj/machinery/light_switch/proc/set_frequency(new_frequency) +/obj/machinery/light_switch/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 8f9381cec34..fa8182ff554 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -165,6 +165,9 @@ Class Procs: /obj/machinery/proc/locate_machinery() return +/obj/machinery/proc/set_frequency() + return + /obj/machinery/process() // If you dont use process or power why are you here return PROCESS_KILL @@ -190,7 +193,7 @@ Class Procs: use_power(active_power_usage,power_channel, 1) return 1 -/obj/machinery/proc/multitool_topic(var/mob/user,var/list/href_list,var/obj/O) +/obj/machinery/proc/multitool_topic(mob/user, list/href_list, obj/O) if("set_id" in href_list) if(!("id_tag" in vars)) warning("set_id: [type] has no id_tag var.") @@ -210,7 +213,7 @@ Class Procs: if(newfreq) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place - src:frequency = sanitize_frequency(newfreq, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + set_frequency(sanitize_frequency(newfreq, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)) return TRUE return FALSE diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm index 50aecd79283..54af22f3f82 100644 --- a/code/modules/logic/logic_base.dm +++ b/code/modules/logic/logic_base.dm @@ -54,7 +54,7 @@ ..() set_frequency(frequency) -/obj/machinery/logic_gate/proc/set_frequency(new_frequency) +/obj/machinery/logic_gate/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 82d78e99e53..2084ef7f175 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -60,7 +60,7 @@ active_power_usage = power_usage //Radio remote control -/obj/machinery/power/emitter/proc/set_frequency(new_frequency) +/obj/machinery/power/emitter/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency if(frequency)