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-08 13:41:26 -05:00
committed by GitHub
parent dfaa796fc2
commit 32cfebfee7
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/research/circuitprinter.dm
View File

@@ -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)