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

Мини-апдейт #493

Merged
merged 14 commits into from
Mar 15, 2024
Merged

Мини-апдейт #493

merged 14 commits into from
Mar 15, 2024

Conversation

FaDeOkno
Copy link
Collaborator

Фиксы и основа ивентового моба (с моими компонентами, yuppie)

Мерджить можно, после апдейта спрайты добавлю и доделаю

В ченджлоге не нуждается

@FaDeOkno
Copy link
Collaborator Author

Не мерджите пока что, у меня вдруг вдохновение

@FaDeOkno FaDeOkno added the DO NOT MERGE Не мерджить label Mar 13, 2024
…распространителя (не заберёт контроль над новым генокрадом), добавил приоритет акшонам генокрада
Copy link
Contributor

github-actions bot commented Mar 13, 2024

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

Resources/Textures/ADT/Actions/slime-hair.rsi

State Old New Status
hair Added

Resources/Textures/ADT/Objects/Specific/genо_larva_white.rsi

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

Edit: diff updated after e7fa29f

@FaDeOkno FaDeOkno removed the DO NOT MERGE Не мерджить label Mar 13, 2024
@FaDeOkno
Copy link
Collaborator Author

Щас сделаю ещё мидраунд генокрада

@FaDeOkno FaDeOkno added the DO NOT MERGE Не мерджить label Mar 13, 2024
@FaDeOkno FaDeOkno removed the DO NOT MERGE Не мерджить label Mar 13, 2024
@FaDeOkno FaDeOkno added the DO NOT MERGE Не мерджить label Mar 13, 2024
@FaDeOkno
Copy link
Collaborator Author

так как никто не замерджил, продолжаю дополнять этот пр

@FaDeOkno FaDeOkno added DO NOT MERGE Не мерджить and removed DO NOT MERGE Не мерджить labels Mar 14, 2024
@FaDeOkno FaDeOkno removed the DO NOT MERGE Не мерджить label Mar 14, 2024
@PyotrIgn PyotrIgn merged commit b9e82db into AdventureTimeSS14:master Mar 15, 2024
8 of 9 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.

3 participants