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

Some food (By GreedL) #369

Merged
merged 9 commits into from
Jun 26, 2024
Merged

Some food (By GreedL) #369

merged 9 commits into from
Jun 26, 2024

Conversation

quartuG3
Copy link

@quartuG3 quartuG3 commented Jun 18, 2024

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

Добавлены новые виды еды, а именно:

  • Медовый пирог
  • Плов
  • Тыквенный пирог
  • Пирог из тофу
  • Бутерброды
  • Жаренная моль
  • Картофельное пюре

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

А почему бы и нет? Пусть будет.

Техническая информаци

Помимо добавления новых видов еды, прототипы рецептов медипенов и шаурмы были перенесены в директорию Starshine

Чейнджлог

🆑 GreedL

  • add: Появились новые виды еды! Медовый пирог, тыквенный пирог, пирог из тоффу, плов, пюре, бутерброды и жаренная моль!

Copy link

github-actions bot commented Jun 18, 2024

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

Resources/Textures/Starshine/Objects/Consumable/Food/Baked/honeypie.rsi

State Old New Status
honeypie-slice Added
honeypie Added

Resources/Textures/Starshine/Objects/Consumable/Food/Baked/mothroachroast.rsi

State Old New Status
mothroachroast Added

Resources/Textures/Starshine/Objects/Consumable/Food/Baked/pumpkinpie.rsi

State Old New Status
pumpkinpie-slice Added
pumpkinpie Added

Resources/Textures/Starshine/Objects/Consumable/Food/Baked/tofupie.rsi

State Old New Status
tofupie-slice Added
tofupie Added

Resources/Textures/Starshine/Objects/Consumable/Food/mashedpotatoes.rsi

State Old New Status
mashedpotatoes Added

Resources/Textures/Starshine/Objects/Consumable/Food/plov.rsi

State Old New Status
plov Added

Resources/Textures/Starshine/Objects/Consumable/Food/sandwich.rsi

State Old New Status
cheesesandwich Added
sandwich Added

Edit: diff updated after 77e4c31

@MilenVolf MilenVolf merged commit bad2487 into Workbench-Team:arumoon-server Jun 26, 2024
17 checks passed
@quartuG3 quartuG3 deleted the GreedL-Food branch July 10, 2024 14:08
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