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.

Sign up for GitHub

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

Jump to bottom

Convert span to macro in our modulars #1135

Merged
merged 3 commits into from
Apr 13, 2024
Merged

Convert span to macro in our modulars #1135

merged 3 commits into from
Apr 13, 2024

Conversation

dj-34
Copy link
Collaborator

@dj-34 dj-34 commented Mar 26, 2024 •
edited
Loading

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

Нужно хуевью, а то вдруг проебал чего
Конвертирует все спаны в макросы в нашем модулар_220

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

Consistency

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

Запускал локалку, ошибок нет

Changelog

NPFC

AyIong
AyIong reviewed Mar 26, 2024
View reviewed changes
Copy link
Collaborator

@AyIong AyIong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пара моментиков

modular_ss220/mobs/code/pet_carrier.dm Show resolved Hide resolved
modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm Outdated Show resolved Hide resolved
modular_ss220/mobs/code/simple_animal/pets/slugcat.dm Outdated Show resolved Hide resolved
modular_ss220/mobs/code/simple_animal/pets/slugcat.dm Outdated Show resolved Hide resolved
@dj-34 dj-34 requested a review from AyIong March 26, 2024 23:04
AyIong
AyIong approved these changes Mar 28, 2024
View reviewed changes
Copy link
Collaborator

@AyIong AyIong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вроде всё ок

@github-actions github-actions bot added the Merge Conflict Ну блять... label Apr 2, 2024
@AyIong
Copy link
Collaborator

AyIong commented Apr 4, 2024

Реши конфликтик

@github-actions github-actions bot added Merge Conflict Ну блять... and removed Merge Conflict Ну блять... labels Apr 13, 2024
@github-actions github-actions bot removed the Merge Conflict Ну блять... label Apr 13, 2024
@AyIong AyIong merged commit 86d59c6 into ss220club:master Apr 13, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AyIong AyIong AyIong approved these changes

Assignees
No one assigned
Labels
📜 CL не требуется
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dj-34 @AyIong @ss220bot