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

Update protolathe.dm

Browse Source
This commit is contained in:
deathride58
2017-12-08 13:42:41 -05:00
committed by GitHub
parent 32cfebfee7
commit d1490a18ed
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/protolathe.dm
+2 -5
View File
@@ -30,16 +30,13 @@ Note: Must be placed west/left of and R&D console to function.
"Computer Parts"
)
var/datum/component/material_container/materials
/obj/machinery/r_n_d/protolathe/Initialize()
create_reagents(0)
<<<<<<< HEAD
var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
=======
materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, 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
return ..()