From 2a0eeea1fb90a021407ae7e1e0db44f4bb20019d Mon Sep 17 00:00:00 2001 From: phil235 Date: Wed, 22 Oct 2014 17:39:09 +0200 Subject: [PATCH] Fixes two anomaly bugs. One: bluespace anomaly doing translocation despite being destroyed. Two: anomaly not checking for the signal code. --- code/modules/assembly/signaler.dm | 5 ++++- code/modules/events/anomaly_bluespace.dm | 2 +- code/modules/events/anomaly_flux.dm | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 7577a7a025c..c970cd62d5f 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -178,7 +178,10 @@ Code: item_state = "electronic" /obj/item/device/assembly/signaler/anomaly/receive_signal(datum/signal/signal) - ..() + if(!signal) + return 0 + if(signal.encryption != code) + return 0 for(var/obj/effect/anomaly/A in orange(0, src)) A.anomalyNeutralize() diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index 256a4322c81..7c2b265f2f0 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -21,7 +21,7 @@ /datum/round_event/anomaly/anomaly_bluespace/end() - if(newAnomaly)//If it hasn't been neutralized, it's time to warp half the station away jeez + if(newAnomaly.loc)//If it hasn't been neutralized, it's time to warp half the station away jeez var/turf/T = pick(get_area_turfs(impact_area)) if(T) // Calculate new position (searches through beacons in world) diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index dc7e9d4b219..6dd10ad3447 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -21,6 +21,6 @@ /datum/round_event/anomaly/anomaly_flux/end() - if(newAnomaly)//If it hasn't been neutralized, it's time to blow up. + if(newAnomaly.loc)//If it hasn't been neutralized, it's time to blow up. explosion(newAnomaly, -1, 3, 5, 5) qdel(newAnomaly) \ No newline at end of file