cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 01:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12727 from FartMaster69420/sheet-storage-fixes

Browse Source 
Stack Stacking: Restacked
This commit is contained in:
Casey
2022-04-17 05:15:09 -04:00
committed by GitHub
parent 196bd27e6b d7abb2e81e
commit 29fa791c5d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/stacks/stack_vr.dm
View File

@@ -3,6 +3,10 @@
/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
if(uses_charge || S.uses_charge) // This should realistically never happen, but in case it does lets avoid breaking things.
return
if(S.stacktype != stacktype)
return
if(S.amount >= S.max_amount)
return
var/transfer = get_amount()
transfer = min(transfer, S.max_amount - S.amount)
@@ -15,6 +19,6 @@
S.add(transfer)
/obj/item/stack/Crossed(var/atom/movable/AM)
if(AM != src && istype(AM, src.type) && !AM.throwing)
if(isturf(AM.loc) && AM != src && istype(AM, src.type) && !AM.throwing)
merge(AM)
return ..()