Merge pull request #4208 from FalseIncarnate/logic

Fixes Anomalies Not Neutralizing
This commit is contained in:
Fox McCloud
2016-04-15 01:12:48 -04:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -16,7 +16,8 @@
aSignal = new(src)
aSignal.code = rand(1,100)
aSignal.frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
aSignal.set_frequency(new_frequency)
/obj/effect/anomaly/proc/anomalyEffect()
if(prob(50))
+2 -1
View File
@@ -110,7 +110,7 @@
if(href_list["send"])
spawn( 0 )
signal()
signal()
if(usr)
attack_self(usr)
@@ -169,6 +169,7 @@
desc = "The neutralized core of an anomaly. It'd probably be valuable for research."
icon_state = "anomaly core"
item_state = "electronic"
receiving = 1
/obj/item/device/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
..()