From 89ab9a0fd77478625542db8dca9d33163c62e51a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 6 Oct 2017 22:24:24 -0500 Subject: [PATCH] Update rdconsole.dm --- code/modules/research/rdconsole.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 6684d0add5..70e4bf7f62 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -324,11 +324,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any. for(var/material in linked_destroy.loaded_item.materials) -<<<<<<< HEAD - linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material) -======= linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (min(linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10), linked_destroy.loaded_item.materials[material]))), material) ->>>>>>> fab4dd3... Update rdconsole.dm SSblackbox.add_details("item_deconstructed","[linked_destroy.loaded_item.type]") linked_destroy.loaded_item = null for(var/obj/I in linked_destroy.contents)