Skip to content

Commit

Permalink
Wait, this is fine actually
Browse files Browse the repository at this point in the history
  • Loading branch information
BiancaWilkson committed Sep 15, 2024
1 parent 7e4cf64 commit 73adece
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(is_cyborg) // No merging cyborg stacks into other stacks
return FALSE
if(ismob(loc) && !inhand) // no merging with items that are on the mob
return FALSE
return TRUE
Expand Down

0 comments on commit 73adece

Please sign in to comment.