Skip to content
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 22.09.2024 #1540

Merged
merged 7 commits into from
Sep 22, 2024
Merged

Merge upstream 22.09.2024 #1540

merged 7 commits into from
Sep 22, 2024

Conversation

Legendaxe
Copy link

@Legendaxe Legendaxe commented Sep 22, 2024

Что этот PR делает

Почему это хорошо для игры

Изображения изменений

Тестирование

Changelog

NPFC

Adrer and others added 7 commits September 20, 2024 08:43
…pe (ParadiseSS13#26565)

* creation

* update

* Update code/game/turfs/simulated/walls_indestructible.dm

Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: CRUNCH <[email protected]>

---------

Signed-off-by: CRUNCH <[email protected]>
Co-authored-by: warriorstar-orion <[email protected]>
…nked (ParadiseSS13#26815)

* Now properly remove/add machines to the rdconsole when (un)linked

* Remove unused variable

---------

Co-authored-by: Adrer <[email protected]>
@github-actions github-actions bot added :finnadie: НЕ МОДУЛЬНО Па-ху-ю. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. TGUI Кто-то решил потрогать интерфейсы. labels Sep 22, 2024
@Legendaxe Legendaxe merged commit b38e334 into ss220club:master Sep 22, 2024
14 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:finnadie: НЕ МОДУЛЬНО Па-ху-ю. 📜 CL невалиден TGUI Кто-то решил потрогать интерфейсы. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants