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

add: Combat Bakery Kit #4576

Merged
merged 7 commits into from
Mar 19, 2024
Merged

Conversation

NightDawnFox
Copy link
Contributor

Описание

Перевыпуск #4471 потому что гайд бипа не работает и пустышки не убираются, увы
Добавляет рецепт круассана для готовки
Добавляет возможность вешать батон на пояс
Добавляет (портирует) набор боевой выпечки:
-Книга-грантер, прямой порт с оффов, позволяет при прочтении узнать рецепт метательного круассана
-Метательный круассан, механика бумеранга
-Боевой багет, 20 брута. В хелпе можно скормить жертве, в харме забиваешь насмерть.
-25 ТК, 2 круассана и багет, плюс книга для крафта новых

Ссылка на предложение/Причина создания ПР

https://discord.com/channels/617003227182792704/755125334097133628/1201323470030647376

@github-actions github-actions bot added the DMI Affects DMI files label Mar 6, 2024
@Etrnlmelancholy
Copy link
Contributor

speed merge

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Mar 9, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Mar 9, 2024
@NightDawnFox
Copy link
Contributor Author

@BeebBeebBoob

2024-03-09.15-56-28.mp4

BeebBeebBoob
BeebBeebBoob previously approved these changes Mar 11, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Mar 12, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Mar 12, 2024
@Etrnlmelancholy
Copy link
Contributor

@Vladisvell @SAADf603 вот би аппрув

@Etrnlmelancholy
Copy link
Contributor

Вот би мердж......... @Dimach

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Mar 19, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Mar 19, 2024
@Dimach Dimach merged commit 2cfb697 into ss220-space:master220 Mar 19, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants