From 2e83779018a90ef8c0c1a9a2f9d57ff8115daca9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 13 Dec 2017 16:49:05 -0500 Subject: [PATCH] Update destructive_analyzer.dm --- code/modules/research/destructive_analyzer.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 60b8798918..e3caef247c 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -121,18 +121,11 @@ Note: Must be placed within 3 tiles of the R&D Console return FALSE if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src)) return FALSE -<<<<<<< HEAD - var/dtype = loaded_item.type - if(destroy_item(loaded_item)) - linked_console.stored_research.research_points += point_value - linked_console.stored_research.deconstructed_items[dtype] = point_value -======= var/loaded_type = loaded_item.type if(destroy_item(loaded_item)) linked_console.stored_research.research_points += point_value linked_console.stored_research.deconstructed_items[loaded_type] = point_value ->>>>>>> 805f0be... Fixes two unrelated runtimes (#33494) return TRUE /obj/machinery/rnd/destructive_analyzer/proc/unload_item()