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

update5 #111

Merged
merged 5 commits into from
Nov 11, 2023
Merged

update5 #111

merged 5 commits into from
Nov 11, 2023

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Nov 10, 2023

image
image

Описание PR

Проверки

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

Изменения

Copy link
Contributor

github-actions bot commented Nov 10, 2023

RSI Diff Bot; head commit 29bd588 merging into 5dbc618
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi

State Old New Status
equipped-HELMET Added
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Edit: diff updated after 29bd588

@Schrodinger71 Schrodinger71 added the DO NOT MERGE Не мерджить label Nov 11, 2023
@Schrodinger71 Schrodinger71 removed the DO NOT MERGE Не мерджить label Nov 11, 2023
@Schrodinger71
Copy link
Collaborator Author

Ready

@PyotrIgn PyotrIgn merged commit 0601c1d into AdventureTimeSS14:master Nov 11, 2023
11 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.

2 participants