cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a runtime caused by stacks accidentally merging twice (#26795)

Browse Source 
* Fixes empty stacks trying to merge together

* more accurate comment
This commit is contained in:
BiancaWilkson
2024-09-15 21:58:29 -04:00
committed by GitHub
parent 44694d8fa5
commit f42a7d9ab0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+2
View File
@@ -127,6 +127,8 @@
// We don't only use istype here, since that will match subtypes, and stack things that shouldn't stack
if(!istype(check, merge_type) || check.merge_type != merge_type)
return FALSE
if(amount <= 0 || check.amount <= 0) // no merging empty stacks that are in the process of being qdel'd
return FALSE
if(is_cyborg) // No merging cyborg stacks into other stacks
return FALSE
if(ismob(loc) && !inhand) // no merging with items that are on the mob