cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12861 from FartMaster69420/stack-patch

Browse Source 
Fixing Stack Deletion
This commit is contained in:
Casey
2022-04-30 23:09:03 -04:00
committed by CHOMPStation2
parent 4ac931f832
commit 5591cddadd
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,6 @@
// Porting stack dragging/auto stacking from TG.
/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)
if(pulledby)
@@ -18,7 +11,27 @@
use(transfer)
S.add(transfer)
/obj/item/stack/proc/can_merge(obj/item/stack/S)
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
if(!isturf(loc) || !isturf(S.loc))
return FALSE
if(src == S)
return FALSE
if(ismob(S.loc) || ismob(loc))
return FALSE
if(S.throwing || throwing)
return FALSE
if(S.amount < 1 || amount < 1)
return FALSE
return TRUE
/obj/item/stack/Crossed(var/atom/movable/AM)
if(isturf(AM.loc) && AM != src && istype(AM, src.type) && !AM.throwing)
if(istype(AM, src.type)) // Sanity so we don't try to merge non-stacks.
if(can_merge(AM))
merge(AM)
return ..()