Skip to content

Commit

Permalink
stack merge check types exacly
Browse files Browse the repository at this point in the history
  • Loading branch information
Slex committed Jan 28, 2025
1 parent a5886a1 commit e8ef372
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/stack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
for(var/obj/item/stack/AM in T.contents)
if(throwing || AM.throwing)
continue
if(istype(AM, merge_type))
if(AM.type == merge_type)
var/obj/item/stack/S = AM
S.merge(src)

Expand Down Expand Up @@ -340,7 +340,7 @@
use(amount, TRUE)

/obj/item/stack/attackby(obj/item/I, mob/user, params)
if(istype(I, merge_type))
if(I.type == merge_type)
var/obj/item/stack/S = I
merge(S)
to_chat(user, "<span class='notice'>Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.</span>")
Expand Down

0 comments on commit e8ef372

Please sign in to comment.