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

безалкогольные напитки (без корицы) #401

Merged
merged 3 commits into from
Sep 5, 2024

Conversation

PyotrIgn
Copy link
Contributor

@PyotrIgn PyotrIgn commented Sep 4, 2024

Добавляю наши напитки. Начинаю с напитков от Рамы

🆑

  • add: Добавлены безалкогольные напитки авторства JustKekc и его персонажа-бармена - Рамазана Стычинского

@github-actions github-actions bot added Status: Needs Review Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации and removed Status: Needs Review labels Sep 4, 2024
Copy link
Contributor

github-actions bot commented Sep 4, 2024

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

Resources/Textures/ADT/Objects/Consumable/Drinks/apple_liqueur_bottle.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/applemartini.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/arcticexplosion.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/arcticlatte.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/azureblue.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/bacardiapple.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/buisinessconservation.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/citrucbalance.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/dobryi.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/eclipsedeclipse.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/elderguards.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
fill-6 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/grapelady.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/hungoverangel.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/milkeclipse.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/penetration.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/saturdaybaron.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/spacebush.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/sugarknight.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/summershade.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/teaoolong.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Consumable/Drinks/wintersun.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/ADT/Objects/Misc/books.rsi

State Old New Status
new-cocktail-book Added

Edit: diff updated after f1494bb

@JustKekc
Copy link
Contributor

JustKekc commented Sep 4, 2024

Не все напитки моего авторства.
Некоторые предложил Кермит.

Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нету вопросов ни к чем,красавчик

@PyotrIgn PyotrIgn added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Sep 4, 2024
@PyotrIgn
Copy link
Contributor Author

PyotrIgn commented Sep 4, 2024

Ток пока не мерджим, я алкашку еще добавлю

@JustKekc
Copy link
Contributor

JustKekc commented Sep 4, 2024

у меня есть ровно одна придирка, которая не достойна чейнж реквеста.

Зимнее солнце не должно давать прохладу, это буквально летняя тень, но наоборот.

@PyotrIgn
Copy link
Contributor Author

PyotrIgn commented Sep 5, 2024

у меня есть ровно одна придирка, которая не достойна чейнж реквеста.

Зимнее солнце не должно давать прохладу, это буквально летняя тень, но наоборот.

Пон, подкорректирую описание и дам тогда легкий прогрев (гоя) в эффекты

@PyotrIgn PyotrIgn removed the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Sep 5, 2024
@PyotrIgn PyotrIgn added this pull request to the merge queue Sep 5, 2024
Merged via the queue into AdventureTimeSS14:master with commit 69fda7c Sep 5, 2024
13 checks passed
@PyotrIgn PyotrIgn deleted the adt_drinks branch September 5, 2024 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants