From ab8b3d25c433b8ab95534ebb9b73fe95556eb319 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Jul 2014 14:48:39 +0400 Subject: [PATCH] Possible fix for #5645 I think issue is that harvester won't forget what artifact it is using until harvesting process is started. --- .../research/xenoarchaeology/machinery/artifact_harvester.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 80abfd7b0ff..776d91751c2 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -85,6 +85,7 @@ harvesting = 0 cur_artifact.anchored = 0 cur_artifact.being_used = 0 + cur_artifact = null src.visible_message("[name] states, \"Battery is full.\"") icon_state = "incubator" @@ -129,7 +130,6 @@ var/articount = 0 var/obj/machinery/artifact/analysed for(var/obj/machinery/artifact/A in get_turf(owned_scanner)) - testing("Found an artifact - [A]") analysed = A articount++ @@ -143,7 +143,7 @@ else if(articount > 1) state("Cannot harvest. Too many artifacts on the pad.") - else if(analyzed) + else if(analysed) cur_artifact = analysed //if both effects are active, we can't harvest either @@ -220,6 +220,7 @@ harvesting = 0 cur_artifact.anchored = 0 cur_artifact.being_used = 0 + cur_artifact = null src.visible_message("[name] states, \"Energy harvesting interrupted.\"") icon_state = "incubator"