From 75ccc3b354aa62f4cab120cdcc1045e00be7037b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 15:57:02 -0600 Subject: [PATCH] Update anomalies.dm --- code/game/objects/effects/anomalies.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 70a6f1bdba..76fd5e5cbf 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -26,14 +26,8 @@ aSignal = new(src) aSignal.name = "[name] core" aSignal.code = rand(1,100) - -<<<<<<< HEAD - aSignal.frequency = rand(1200, 1599) - if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven! -======= aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven! ->>>>>>> 25080ff... defines math (#33498) aSignal.frequency++ if(new_lifespan)