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

micro-upstream #6 #167

Merged
merged 10 commits into from
Dec 16, 2024
Merged

micro-upstream #6 #167

merged 10 commits into from
Dec 16, 2024

Conversation

AwareFoxy
Copy link
Collaborator

праздник к нам приходит
праздник к нам приходит

@AwareFoxy AwareFoxy requested a review from Vonsant as a code owner December 16, 2024 14:29
Copy link

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

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

@github-actions github-actions bot added S: Untriaged S: Needs Review ПРу необходим ревью labels Dec 16, 2024
@github-actions github-actions bot closed this Dec 16, 2024
@github-actions github-actions bot added size/XL Changes: Sprites Changes: Map Изменяет карты Changes: No C# ПР без сишарпа and removed S: Needs Review ПРу необходим ревью size/XL S: Untriaged labels Dec 16, 2024
@AwareFoxy AwareFoxy reopened this Dec 16, 2024
Copy link

github-actions bot commented Dec 16, 2024

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

Resources/Textures/Objects/Fun/pai.rsi

State Old New Status
icon-potato-off Modified
potato-base Modified
potato-off-overlay Modified
potato-on-overlay Modified
potato-searching-overlay Modified

Resources/Textures/Objects/Materials/materials.rsi

State Old New Status
cotton Modified
cotton_2 Modified
cotton_3 Modified
pyrotton Modified
pyrotton_2 Modified
pyrotton_3 Modified

Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/apple.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/berries.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi

State Old New Status
dried Modified
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/chili.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/grape.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/lily.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/lime.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/orange.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/potato.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi

State Old New Status
dried Modified
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi

State Old New Status
produce Modified

Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi

State Old New Status
produce Modified
slice Modified

Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi

State Old New Status
activated Modified
icon Modified

Edit: diff updated after 4b7be5d

@AwareFoxy
Copy link
Collaborator Author

github sosi

@AwareFoxy AwareFoxy merged commit 6bb8e2b into space-syndicate:master Dec 16, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Изменяет карты Changes: No C# ПР без сишарпа Changes: Sprites size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants