shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update circuitprinter.dm

Browse Source
This commit is contained in:
deathride58
2017-12-05 17:44:45 -05:00
committed by GitHub
parent 3bff5f4cd6
commit 9c0eae753d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
-6
View File
@@ -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 ..()