From 5fb19462010128539801a1886a425be73d69aa6e Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Wed, 30 Mar 2016 15:42:35 -0400 Subject: [PATCH] Fixes "Adjust Signaler Settings" option not working Window does show up behind the multi-tool menu, but that's not a huge issue. --- code/modules/assembly/signaler.dm | 13 ++++++------- code/modules/logic/converter.dm | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 2902e3b59c2..d6d6352f333 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -20,13 +20,12 @@ /obj/item/device/assembly/signaler/New() ..() - if(!radio_controller) - spawn(40) - set_frequency(frequency) - else - spawn(1) // For things that set the frequency directly - set_frequency(frequency) - return + if(radio_controller) + set_frequency(frequency) + +/obj/item/device/assembly/signaler/initialize() + if(radio_controller) + set_frequency(frequency) /obj/item/device/assembly/signaler/Destroy() if(radio_controller) diff --git a/code/modules/logic/converter.dm b/code/modules/logic/converter.dm index 3c9266b6c88..635bbf87176 100644 --- a/code/modules/logic/converter.dm +++ b/code/modules/logic/converter.dm @@ -112,7 +112,7 @@ attached_signaler.receiving = 1 else attached_signaler.receiving = 0 - if("adjust_signaler" in href_list && attached_signaler) //Make sure that we have a signaler attached to handle this one, otherwise ignore this command + if(("adjust_signaler" in href_list) && attached_signaler) //Make sure that we have a signaler attached to handle this one, otherwise ignore this command attached_signaler.interact(user, 1) update_multitool_menu(user)