forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 124
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.
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
Merge upstream 29.01.2024 #969
Merged
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
* Remove new lines from svgs * [ci skip] * Build and update tgui --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: /tg/ui <41898282+github-actions[bot]@users.noreply.github.com>
* extinguisher once again works on yourself * you too
* wtf * shielded component
* Fixed wrong necropolis walls. * Fixed some missed walls
* Refactor createMessage out of message server * Change radio message * Add reminder * Fix linting errors * Fix more linting errors --------- Co-authored-by: Arthri <[email protected]>
* if you being throwed, you're not moving * throw block_movement variable * forgot arg here * tether might keep movement * Update code/controllers/subsystem/SSthrowing.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Luc <[email protected]>
github-actions
bot
added
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
TGUI
Кто-то решил потрогать интерфейсы.
labels
Jan 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Merge Conflict
Ну блять...
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
📜 CL валиден
TGUI
Кто-то решил потрогать интерфейсы.
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
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.
Что этот PR делает
Почему это хорошо для игры
Изображения изменений
Тестирование
Changelog
🆑
add: Мержим оффов
fix: Огнетушитель и брызгалка снова работают на тайл на котором стоит использующий
fix: Перезарядка культистского костюма с щитом снова работает
tweak: Хирургические подносы теперь не помещаются в мешки
add: косноли для запросов теперь напоминают про непрочитанные сообщения
tweak: Теперь нельзя двигаться во время вашего полета(броска)
/:cl: