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 #732

Merged
merged 9 commits into from
Nov 18, 2023
Merged

merge upstream #732

merged 9 commits into from
Nov 18, 2023

Conversation

Legendaxe
Copy link

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

Обновляемся до оффов

🆑
add: Обновляемся до оффов
/:cl:

S34NW and others added 9 commits November 14, 2023 13:30
* Prevent teleporting onto a tile with a teleporter

* True and false

---------

Co-authored-by: [email protected] <[email protected]>
* The fixes

* This probably has a worse underlying cause

* Update code/modules/paperwork/paper.dm

Co-authored-by: Contrabang <[email protected]>

* Cotnra review

* Contra review

* Removes nullcheck

---------

Co-authored-by: Contrabang <[email protected]>
)

* engoodening

* oops

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <[email protected]>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Luc <[email protected]>

* fingy print

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: GDN <[email protected]>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <[email protected]>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <[email protected]>

* contra review.

---------

Co-authored-by: Contrabang <[email protected]>
Co-authored-by: Luc <[email protected]>
Co-authored-by: GDN <[email protected]>
…adiseSS13#22856)

* i love chaos

* contra review

* contra review 2 or something

* comment fix
@github-actions github-actions bot added :neckbeard: Документация Улучшения и дополнения в документации 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. labels Nov 18, 2023
@Legendaxe Legendaxe merged commit 2dea6f0 into ss220club:master Nov 18, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. :neckbeard: Документация Улучшения и дополнения в документации 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants