From f459f909c0e17def2d6fba5e956eaa691e889eab Mon Sep 17 00:00:00 2001 From: YPOQ <30683121+YPOQ@users.noreply.github.com> Date: Wed, 9 May 2018 15:25:01 -0600 Subject: [PATCH 1/2] Fixes anomalies not listening on the correct frequency --- code/game/objects/effects/anomalies.dm | 9 +++++---- code/modules/assembly/signaler.dm | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index b3cb0ff9c4..a194a6ac9f 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -8,7 +8,7 @@ anchored = TRUE light_range = 3 var/movechance = 70 - var/obj/item/assembly/signaler/anomaly/aSignal = null + var/obj/item/assembly/signaler/anomaly/aSignal var/area/impact_area var/lifespan = 990 @@ -27,9 +27,10 @@ aSignal.name = "[name] core" aSignal.code = rand(1,100) - aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) - if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven! - aSignal.frequency++ + var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) + if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven! + frequency++ + aSignal.set_frequency(frequency) if(new_lifespan) lifespan = new_lifespan diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 20bcf25138..c0af20ead6 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -111,7 +111,7 @@ Code: var/obj/item/assembly/signaler/signaler2 = W if(secured && signaler2.secured) code = signaler2.code - frequency = signaler2.frequency + set_frequency(signaler2.frequency) to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]") ..()