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

Nukie playtime #1087

Merged
merged 9 commits into from
Jan 10, 2025
Merged

Nukie playtime #1087

merged 9 commits into from
Jan 10, 2025

Conversation

VigersRay
Copy link
Collaborator

@VigersRay VigersRay commented Jan 10, 2025

Кратное описание

По какой причине

Медиа(Видео/Скриншоты)

Проверки

  • Я не требую помощи для завершения PR
  • Перед выкладыванием/запросом о рассмотрении PR, Я проверил работоспособность изменений.
  • Я добавил скриншоты/видео изменений, или данный PR не меняет внутриигровые механики

Changelog

🆑 VigersRay х Cojoke-dot

  • add: Добавлено отслеживание игрового времени для ролей антагонистов.

Cojoke-dot and others added 9 commits November 9, 2024 03:31
* border

* Update meta.json

* Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json

---------

Co-authored-by: slarticodefast <[email protected]>
* Trim trailing newlines from examine messages

* TrimTrailingNewlines -> TrimEnd
# Conflicts:
#	Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
Copy link
Contributor

RSI Diff Bot; head commit 8146f4f merging into 60d725e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster53_legit Modified

@VigersRay VigersRay merged commit 5282bf4 into master Jan 10, 2025
13 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants