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

Removes recursion

Browse Source
This commit is contained in:
YPOQ
2018-05-09 17:37:03 -06:00
parent 6327b79db6
commit c26a19d523
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+5 -6
View File
@@ -33,14 +33,13 @@
return
return TRUE
/obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE)
/obj/item/stack/Initialize(mapload, new_amount, merge = TRUE)
. = ..()
if(new_amount)
if(new_amount > max_amount)
amount = max_amount
new type(loc, new_amount - max_amount, merge)
else
amount = new_amount
amount = new_amount
while(amount > max_amount)
amount -= max_amount
new type(loc, max_amount, FALSE)
if(!merge_type)
merge_type = type
if(merge)