Skip to content

Обьединение стеков теперь не проверяет дочерние типы #13750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Обьединение стеков теперь не проверяет дочерние типы #13750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/stack.dm
View file
Open in desktop
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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

проблема - у нас есть разные /obj/item/stack/sheet/metal/fifty для мапперов и спавна

возможно надо тогда им всем правильный 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
Loading