cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port over tg ore stack and stack merging

Browse Source 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
This commit is contained in:
variableundefined
2018-08-10 08:09:37 +08:00
parent 11144bb939
commit 6b1b38d4f1
50 changed files with 394 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+2 -2
View File
@@ -96,7 +96,7 @@
/obj/machinery/mineral/processing_unit/process()
var/turf/T = get_step(src, input_dir)
if(T)
for(var/obj/item/ore/O in T)
for(var/obj/item/stack/ore/O in T)
process_ore(O)
CHECK_TICK
if(on)
@@ -111,7 +111,7 @@
CONSOLE.updateUsrDialog()
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/ore/O)
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O)
GET_COMPONENT(materials, /datum/component/material_container)
var/material_amount = materials.get_item_material_amount(O)
if(!materials.has_space(material_amount))