cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking

Browse Source 
Revert "Ore Stacking"
This commit is contained in:
Leo
2017-12-02 18:00:45 -02:00
committed by GitHub
parent a97b4a07a8 8c4885cf6e
commit 80aad8cef0
54 changed files with 265 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/material_container.dm
+3 -3
View File
@@ -113,7 +113,7 @@
return (total_amount - total_amount_saved)
return FALSE
/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1)
/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt)
if(isnull(amt))
amt = S.amount
@@ -131,7 +131,7 @@
if(!amt)
return FALSE
last_inserted_id = insert_materials(S,amt * multiplier)
last_inserted_id = insert_materials(S,amt)
last_inserted_type = S.type
S.use(amt)
last_amount_inserted = amt
@@ -141,7 +141,7 @@
if(!I)
return FALSE
if(istype(I, /obj/item/stack))
return insert_stack(I, stack_amt, multiplier)
return insert_stack(I, stack_amt)
var/material_amount = get_item_material_amount(I)
if(!material_amount || !has_space(material_amount))