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

Добавление серой одежды #720

Merged
merged 5 commits into from
Nov 1, 2024

Conversation

Hyrmik
Copy link
Contributor

@Hyrmik Hyrmik commented Oct 31, 2024

Описание PR

Добавление серой кепки и серого комбинезона для надзирателя службы безопасности

Медиа

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Чейнджлог

🆑 Хурмик

  • add: НаноТрейзен добавила в гардероб серое одеяние для опытных надзирателей. Слава НТ!

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Oct 31, 2024
Copy link
Contributor

github-actions bot commented Oct 31, 2024

RSI Diff Bot; head commit 6dc5aaa merging into af9ff28
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 6dc5aaa

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Всё гуд

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Nov 1, 2024
Merged via the queue into AdventureTimeSS14:master with commit 8257dbd Nov 1, 2024
15 checks passed
@Hyrmik Hyrmik deleted the sec_gray branch November 1, 2024 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants