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

Мини-апстрим #217

Closed
wants to merge 8 commits into from

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jan 3, 2025

Описание PR

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

Ссылка на ветку

Технические детали

Медиа

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

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

@github-actions github-actions bot added S: Untriaged S: Needs Review ПРу необходим ревью labels Jan 3, 2025
Copy link

github-actions bot commented Jan 3, 2025

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

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

@github-actions github-actions bot closed this Jan 3, 2025
@github-actions github-actions bot added Changes: Sprites Changes: Map Изменяет карты Changes: Audio size/XL and removed S: Needs Review ПРу необходим ревью labels Jan 3, 2025
@Vonsant Vonsant reopened this Jan 3, 2025
Copy link

github-actions bot commented Jan 3, 2025

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

Resources/Textures/Clothing/Head/Hardhats/armored.rsi

State Old New Status
icon Modified
light-icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi

State Old New Status
icon Modified
light-icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Edit: diff updated after b165df8

@github-actions github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Jan 3, 2025
Copy link

github-actions bot commented Jan 3, 2025

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

@Vonsant Vonsant closed this Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes: Map Изменяет карты Changes: Sprites S: Merge Conflict У ПРа есть мердж конфликт S: Untriaged size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants