cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stacks incorrectly stacking with subtypes (#76166)

Browse Source 
Makes the type check to determine if two items will stack more strict,
so that subtypes that shouldn't stack don't. Fixed #76157
This commit is contained in:
Nick
2023-06-26 03:30:42 -05:00
committed by GitHub
parent efb2b94faa
commit b13e504ba1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+2 -1
View File
@@ -566,7 +566,8 @@
* - [inhand][boolean]: Whether or not the stack to check should act like it's in a mob's hand.
*/
/obj/item/stack/proc/can_merge(obj/item/stack/check, inhand = FALSE)
if(!istype(check, merge_type))
// 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(mats_per_unit ~! check.mats_per_unit) // ~! in case of lists this operator checks only keys, but not values
return FALSE