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

Corvax monkeys clothing fix #2315

Merged
merged 6 commits into from
Jun 24, 2024

Conversation

Ko4ergaPunk
Copy link
Collaborator

@Ko4ergaPunk Ko4ergaPunk commented Jun 21, 2024

Описание PR

Выполнен #1423

Медиа

image

Проверки

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

Изменения

🆑

@github-actions github-actions bot added Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design labels Jun 21, 2024
Copy link
Contributor

github-actions bot commented Jun 21, 2024

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

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/centcom_official.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rainbow.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_officer_black.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/disco.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/kim.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added

Edit: diff updated after 0f816f2

@Ko4ergaPunk Ko4ergaPunk marked this pull request as ready for review June 21, 2024 16:46
@Ko4ergaPunk Ko4ergaPunk requested a review from Morb0 as a code owner June 21, 2024 16:46
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Merge Conflict PR have unsolved merge conflicts labels Jun 21, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

# Conflicts:
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/rd_classical.rsi/equipped-INNERCLOTHING-monkey.png
@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Jun 22, 2024
@SonicHDC SonicHDC merged commit 13e83f3 into space-syndicate:master Jun 24, 2024
12 checks passed
@Ko4ergaPunk Ko4ergaPunk deleted the Monkeys-Corvax-jumpsuits branch June 30, 2024 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants