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

Resprite intercom's panel #2669

Closed

Conversation

MureixloI
Copy link
Contributor

Описание PR

Изменён спрайт панели интеркома

Почему / Баланс

Старый спрайт был поломан и смещён в никуда

Требования

Критические изменения

Список изменений

🆑 MureixloL

  • tweak: Изменены спрайты

@MureixloI MureixloI requested a review from Morb0 as a code owner October 14, 2024 11:08
@github-actions github-actions bot added 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 labels Oct 14, 2024
Copy link
Contributor

github-actions bot commented Oct 14, 2024

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

Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Modified
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Structures/Wallmounts/intercom.rsi

State Old New Status
panel Modified

Edit: diff updated after c24dfd2

@Vonsant
Copy link
Contributor

Vonsant commented Oct 14, 2024

Вот би респрайт скрапа...

@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Oct 14, 2024
Copy link
Contributor

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

@lzk228
Copy link
Collaborator

lzk228 commented Oct 14, 2024

почему спрайтеры не умеют делать пры прямо от мастера, а не от комитов годовалой давности

@Vonsant
Copy link
Contributor

Vonsant commented Oct 14, 2024

Так они не кодеры, а спрайтеры.

@mhamsterr
Copy link
Contributor

почему спрайтеры не умеют делать пры прямо от мастера, а не от комитов годовалой давности

Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git

Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду git branch <название_ветки> и сбросив измененив в master-ветке.

@MureixloI MureixloI closed this Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Merge Conflict PR have unsolved merge conflicts No C# Code has not been changed 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.

4 participants