Обьединение стеков теперь не проверяет дочерние типы #13750
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changelog status: 🔘 No changelog |
volas
reviewed
Jan 29, 2025
| @@ -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) | |||
There was a problem hiding this comment.
проблема - у нас есть разные /obj/item/stack/sheet/metal/fifty для мапперов и спавна
возможно надо тогда им всем правильный merge_type прописать
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание изменений
Fixes #13378
При мерже стека теперь проверяется не тип + дочерние, а явно лишь тип объединяемых стеков.
Почему и что этот ПР улучшит
Исправление бага, позволяющего объединять стеки разного качества (например стекло и укрепленное стекло)
Авторство
Чеинжлог