Portable artifact container #381
Merged
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
This reverts commit f9d2a58.
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
|
RSI Diff Bot; head commit 82652d5 merging into 9e87823 Resources/Textures/Starshine/Objects/Storage/Briefcases/portable_artifact_container.rsi
|
|
Загрузи апстрим, я не могу заново прокрутить тесты из-за обновления Гитхаба... |
…ace-station-14 into Briefcase-Artifact-Container
This is unique Starshine item, so no need to have more conflicts in the future. Probably should be PR'ed to original fork.
…kbench-Team/space-station-14 into Briefcase-Artifact-Container
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.
О запросе слияния
Так вот знаете куда НТ тратит своё бюджет? Ну всеми ясно что 90% это ядеро стойкие мусорки а остальные 10? Конечно же на мягкие ручки для портативного контейнера артефактов! Покупайте только сегодня и получите скидку в 0%! только сейчас и только на Nanotrasen.com!
Обратная тех поддержка [email protected]Почему / Баланс
Мяу
Медиа
Чейнджлог
🆑 Astr0naut & bebroboid