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

Drinks cartons return #343

Merged
merged 12 commits into from
May 27, 2024

Conversation

lAstronautl
Copy link

@lAstronautl lAstronautl commented May 19, 2024

О запросе слияния

Новые картонные коробки для соков

Медиа

Снимок
Снимок7
Снимок6
Снимок8
Снимок5
Снимок2
image
Снимок
Снимок5
Снимок7

Чейнджлог
🆑 Astr0naut and greedl_

  • add: Добавлены картонные коробочки для сока!

Copy link

github-actions bot commented May 19, 2024

RSI Diff Bot; head commit 5158dcc merging into 6caa71d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi

State Old New Status
icon Added
icon_open Added
label-apple Added
label-banana Added
label-berry Added
label-carrot Added
label-catdespair Added
label-lemon Added
label-moff Added
label-orange Added
label-pineapple Added
label-sec Added
label-syndi Added
label-watermelon Added
label-weh Added

Edit: diff updated after 5158dcc

@lAstronautl lAstronautl marked this pull request as draft May 22, 2024 11:28
@MilenVolf MilenVolf marked this pull request as ready for review May 24, 2024 14:18
lAstronautl and others added 7 commits May 24, 2024 18:37
интересный факт пока я делал этот коминт у меня пк крашнул 5 раз :catdespair:
@MilenVolf MilenVolf merged commit 9e8fbbf into Workbench-Team:arumoon-server May 27, 2024
16 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants