From 9c0eae753dfe5b032392736c88cd12ed47751988 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Dec 2017 17:44:45 -0500 Subject: [PATCH] Update circuitprinter.dm --- code/modules/research/circuitprinter.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index c863ba8afa..8609262aa3 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -27,15 +27,9 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). "Computer Parts" ) -<<<<<<< HEAD /obj/machinery/r_n_d/circuit_imprinter/Initialize() - var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), - FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready)) -======= -/obj/machinery/rnd/circuit_imprinter/Initialize() materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert)) ->>>>>>> 3aba012... Removes ComponentActivated in favor of callbacks (#33274) materials.precise_insertion = TRUE create_reagents(0) return ..()