Defines math, take 2

2017-12-17 11:02:11 -05:00
parent 220e1cd8cf
commit f875d4e176
180 changed files with 1250 additions and 644 deletions
@@ -27,8 +27,13 @@
 	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)