From 5e68eb8b80010f366a447cb240a67b583edf4114 Mon Sep 17 00:00:00 2001 From: Jackraxxus <60418544+Jackraxxus@users.noreply.github.com> Date: Sun, 6 Feb 2022 01:18:56 +1100 Subject: [PATCH] Adds an extra signaler check to compare frequencies with the incoming signal (#64666) Fixes setting signallers frequency. --- code/game/objects/items/devices/pressureplates.dm | 2 +- code/modules/assembly/signaler.dm | 5 ++--- .../modular_computers/file_system/programs/signaler.dm | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index d3de1f72520..146dedb0d15 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -29,7 +29,7 @@ if(roundstart_signaller) sigdev = new sigdev.code = roundstart_signaller_code - sigdev.frequency = roundstart_signaller_freq + sigdev.set_frequency(roundstart_signaller_freq) if(undertile_pressureplate) AddElement(/datum/element/undertile, tile_overlay = tile_overlay, use_anchor = TRUE) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 68b1e6a92e5..21886c1eb74 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -98,9 +98,8 @@ INVOKE_ASYNC(src, .proc/signal) . = TRUE if("freq") - frequency = unformat_frequency(params["freq"]) - frequency = sanitize_frequency(frequency, TRUE) - set_frequency(frequency) + var/new_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) + set_frequency(new_frequency) . = TRUE if("code") code = text2num(params["code"]) diff --git a/code/modules/modular_computers/file_system/programs/signaler.dm b/code/modules/modular_computers/file_system/programs/signaler.dm index b7bbcacaa02..125b43e4d67 100644 --- a/code/modules/modular_computers/file_system/programs/signaler.dm +++ b/code/modules/modular_computers/file_system/programs/signaler.dm @@ -46,9 +46,8 @@ INVOKE_ASYNC(src, .proc/signal) . = TRUE if("freq") - signal_frequency = unformat_frequency(params["freq"]) - signal_frequency = sanitize_frequency(signal_frequency, TRUE) - set_frequency(signal_frequency) + var/new_signal_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) + set_frequency(new_signal_frequency) . = TRUE if("code") signal_code = text2num(params["code"])