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

Update mech_fabricator.dm

Browse Source
This commit is contained in:
deathride58
2017-12-05 17:42:56 -05:00
committed by GitHub
parent e1f658a50d
commit cf23ed4e14
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mech_fabricator.dm
-10
View File
@@ -35,21 +35,11 @@
)
/obj/machinery/mecha_part_fabricator/Initialize()
<<<<<<< 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),
FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
materials.precise_insertion = TRUE
. = ..()
files = new /datum/research(src) //Setup the research data holder.
=======
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),
FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
stored_research = new
return ..()
>>>>>>> 3aba012... Removes ComponentActivated in favor of callbacks (#33274)
/obj/machinery/mecha_part_fabricator/RefreshParts()
var/T = 0