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

Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399

Browse Source 
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
This commit is contained in:
LetterJay
2017-10-10 05:54:08 -04:00
committed by GitHub
parent 8aabbe56b7 c074cabe1a
commit 26800c1d1d
7 changed files with 424 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/droneDispenser.dm
+1
View File
@@ -53,6 +53,7 @@
. = ..()
var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
materials.insert_amount(starting_amount)
materials.precise_insertion = TRUE
using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
/obj/machinery/droneDispenser/preloaded
code/game/mecha/mech_fabricator.dm
+2 -1
View File
@@ -35,9 +35,10 @@
)
/obj/machinery/mecha_part_fabricator/Initialize()
AddComponent(/datum/component/material_container,
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.