From 32cfebfee7e0295bd2e16040a5a77aacf0aba64b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 8 Dec 2017 13:41:26 -0500 Subject: [PATCH] Update circuitprinter.dm --- code/modules/research/circuitprinter.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index af03ebd8b6..582efaa474 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -27,15 +27,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). "Computer Parts" ) -<<<<<<< HEAD var/datum/component/material_container/materials /obj/machinery/r_n_d/circuit_imprinter/Initialize() - materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), -======= -/obj/machinery/rnd/circuit_imprinter/Initialize() materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), 0, ->>>>>>> 09ec914... Fixes certain material containers (#33370) FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert)) materials.precise_insertion = TRUE create_reagents(0)