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

Corvax drinks added #1736

Merged
merged 6 commits into from
Feb 19, 2024
Merged

Conversation

Ko4ergaPunk
Copy link
Collaborator

@Ko4ergaPunk Ko4ergaPunk commented Jan 8, 2024

Описание PR

Добавлено 13 новых коктейлей и 1 бутылка биттер ликёра. Также альтернативный рецепт Мохито, для совместимости с новым коктейлем.

  • Alexander
  • Bad Touch (отсылка к VA-11 Hall-A)
  • Boyarsky
  • Bramble
  • Daiquiri
  • Dark and stormy
  • Espresso Martini
  • Mai Tai
  • Moscow Mule
  • Negroni
  • Old fashioned
  • Paloma
  • Yorsh
  • Campari

Campari добавлен в Алкомат.

Медиа
preview

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Ko4erga

  • add: Добавлено 13 новых коктейлей для крафта и бутылка кампари.
  • tweak: В Алкомат добавлена бутылка кампари.

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: No C# Code has not been changed labels Jan 8, 2024
Copy link
Contributor

github-actions bot commented Jan 8, 2024

RSI Diff Bot; head commit 0a77ee6 merging into 8ed4939
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Corvax/Objects/Consumable/Drinks/alexander.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/badTouch.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/boyarsky.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/bramble.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/campari.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/daiquiri.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/darkAndStormy.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/espressoMartini.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/maiTai.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/moscowMule.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/negroni.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/oldFashioned.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/paloma.rsi

State Old New Status
icon Added

Resources/Textures/Corvax/Objects/Consumable/Drinks/yorsh.rsi

State Old New Status
icon Added

Edit: diff updated after 0a77ee6

@lzk228
Copy link
Collaborator

lzk228 commented Jan 8, 2024

я против только потому что напитков и так очень много

@lapatison
Copy link
Contributor

Хороший ПР
Обязательный комментарий - почему бы не оффам?
По ПРу - имхо alexandr везде надо заменить на alexander

@AwareFoxy
Copy link
Contributor

Хороший ПР

Обязательный комментарий - почему бы не оффам?

По ПРу - имхо alexandr везде надо заменить на alexander

Официалы не принимают ПРы на напитки 🥹

@lzk228
Copy link
Collaborator

lzk228 commented Jan 8, 2024

потому что их прототипы нужно ОООЧЕНЬ сильно почистить

@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Jan 27, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Jan 28, 2024
@ficcialfaint ficcialfaint merged commit db23332 into space-syndicate:master Feb 19, 2024
15 checks passed
@NikaVichy
Copy link
Contributor

🥳🎉🥳

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants