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

micro-upstream #4 #149

Merged
merged 7 commits into from
Dec 12, 2024
Merged

micro-upstream #4 #149

merged 7 commits into from
Dec 12, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Dec 11, 2024 •
edited
Loading

Описание PR

Спасибо ваниллерам за бета-тест.

@github-actions github-actions bot closed this Dec 11, 2024
@github-actions github-actions bot added size/L S: Untriaged Changes: Sprites Changes: Localization Изменяет локализацию Changes: No C# ПР без сишарпа labels Dec 11, 2024
@github-actions GitHub Actions
Copy link

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

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

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

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Structures/Furniture/rollerbeds.rsi

State Old New Status
cheap_rollerbed Modified
cheap_rollerbed_buckled Modified
cheap_rollerbed_folded Modified
emergency_rollerbed Modified
emergency_rollerbed_buckled Modified
emergency_rollerbed_folded Modified

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster52_legit Modified

Edit: diff updated after ae180fc

@Vonsant Vonsant reopened this Dec 11, 2024
@space-syndicate space-syndicate deleted a comment from github-actions bot Dec 11, 2024
@AwareFoxy AwareFoxy changed the title Апстрим с переводами micro-upstream #4 Dec 12, 2024
@AwareFoxy AwareFoxy merged commit 9db0a8e into space-syndicate:master Dec 12, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменяет локализацию Changes: No C# ПР без сишарпа Changes: Sprites S: Untriaged size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Vonsant @AwareFoxy @lzk228 @lapatison @MureixloI @IanComradeBot