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.

Sign up for GitHub

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

Jump to bottom

Обзор апстрима #185

Closed
wants to merge 11 commits into from
Closed

Обзор апстрима #185

wants to merge 11 commits into from

Conversation

FireNameFN
Copy link
Collaborator

No description provided.

@github-actions GitHub Actions
Copy link

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

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

@github-actions github-actions bot closed this Dec 23, 2024
@github-actions github-actions bot added S: Untriaged size/XL Changes: Sprites Changes: Map Изменяет карты Changes: No C# ПР без сишарпа and removed S: Untriaged labels Dec 23, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 23, 2024 •
edited
Loading

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

Resources/Textures/Objects/Misc/Lights/lamp.rsi

State Old New Status
christmaslamp-on Modified
christmaslamp Modified

Resources/Textures/Objects/Misc/Lights/lampint.rsi

State Old New Status
burnt Modified
flashing Modified
lamp-int-on Modified
lamp-int Modified

Resources/Textures/Objects/Misc/Lights/lampgreen.rsi

State Old New Status
christmaslamp-on Added
christmaslamp Added

Edit: diff updated after 3122825

@Vonsant Vonsant reopened this Dec 23, 2024
@FireNameFN FireNameFN marked this pull request as ready for review December 23, 2024 23:58
@FireNameFN FireNameFN requested a review from Vonsant as a code owner December 23, 2024 23:58
@github-actions GitHub Actions
Copy link

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

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

@github-actions github-actions bot closed this Dec 23, 2024
@github-actions github-actions bot added the S: Needs Review ПРу необходим ревью label Dec 23, 2024
@FireNameFN FireNameFN reopened this Dec 23, 2024
@github-actions github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Dec 23, 2024
@github-actions GitHub Actions
Copy link

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

@FireNameFN
Copy link
Collaborator Author

Насмотрелись.

@FireNameFN FireNameFN closed this Dec 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Vonsant Vonsant Awaiting requested review from Vonsant Vonsant is a code owner

Assignees
No one assigned
Labels
Changes: Map Изменяет карты Changes: No C# ПР без сишарпа Changes: Sprites S: Merge Conflict У ПРа есть мердж конфликт S: Needs Review ПРу необходим ревью size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.