Skip to content

Commit

Permalink
Fixes a runtime caused by stacks accidentally merging twice (#26795)
Browse files Browse the repository at this point in the history
* Fixes empty stacks trying to merge together

* more accurate comment
  • Loading branch information
BiancaWilkson authored Sep 16, 2024
1 parent 44694d8 commit f42a7d9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/game/objects/items/stacks/stack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f42a7d9

Please sign in to comment.