From 47c9251cd4d296118dd4cf1a8ad16e9201fde14f Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Sat, 7 Dec 2024 14:53:35 -0500 Subject: [PATCH] Signallers no longer hit the other signaller when you're copying frequencies (#3889) :cl: fix: Signallers no longer hit the other signaller when you're copying frequencies /:cl: --- code/modules/assembly/signaler.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index b1203d358e7f..f0898cc53b6a 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -82,12 +82,13 @@ update_appearance() /obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params) - if(issignaler(W)) + if(issignaler(W) && secured) var/obj/item/assembly/signaler/signaler2 = W - if(secured && signaler2.secured) + if(signaler2.secured) code = signaler2.code set_frequency(signaler2.frequency) to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]") + return TRUE ..() /obj/item/assembly/signaler/proc/signal()