From d1687dc50ec3661aef5ba06f5e841bb9a0cba695 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Jul 2014 13:39:56 +0400 Subject: [PATCH] Fixes #5648 Now scanner will just give warning if clicked too fast, instead of giving obsolete data. Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing. --- .../xenoarchaeology/tools/tools_anoscanner.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index 257c7389cce..acc6d56a73f 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -13,22 +13,23 @@ var/last_scan_time = 0 var/scan_delay = 25 -/obj/item/device/ano_scanner/New() - ..() - spawn(0) - scan() +/obj/item/device/ano_scanner/initialize() + scan() /obj/item/device/ano_scanner/attack_self(var/mob/user as mob) return src.interact(user) /obj/item/device/ano_scanner/interact(var/mob/user as mob) var/message = "Background radiation levels detected." - if(nearest_artifact_distance >= 0) - message = "Exotic energy detected on wavelength '[nearest_artifact_id]' in a radius of [nearest_artifact_distance]m" - user << "[message]" if(world.time - last_scan_time >= scan_delay) spawn(0) scan() + if(nearest_artifact_distance >= 0) + message = "Exotic energy detected on wavelength '[nearest_artifact_id]' in a radius of [nearest_artifact_distance]m" + else + message = "Scanning array is recharging." + + user << "[message]" /obj/item/device/ano_scanner/proc/scan() set background = 1