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

Новый коктейль из крови #441

Merged
merged 2 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ flavor-complex-businessconversation = как горечь, алкоголь и
flavor-complex-applemartini = как алкоголь и зелёное яблоко
flavor-complex-bacardiapple = как ром с привкусом яблока
flavor-complex-elderguards = как закон и очень странная смесь алкоголя с нотками уксуса
flavor-complex-limeshade = как теплая тень с лаймовым привкусом
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,8 @@ ent-ADTDrinkBacardiAppleGlass = { ent-DrinkGlass }
ent-ADTDrinkElderGuardsGlass = { ent-DrinkGlass }
.suffix = Старая гвардия
.desc = { ent-DrinkGlass.desc }

ent-ADTDrinkLimeShadeGlass = { ent-DrinkGlass }
.suffix = Лаймовый Шэйд
.desc = { ent-DrinkGlass.desc }

Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ bacardi-apple-desc = "Вам нравятся лонги и физзы?"

elder-guards-name = старая гвардия
elder-guards-desc = Рецепт данного напитка когда-то давно был выдуман находу одним детективом с протезом руки.

lime-shade-name = лаймовый Шэйд
lime-shade-desc = Говорят кому удосужилось попробовать его, жаловались на резкие скачки в стороны, скорее всего они просто переборщили со спиртным.
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,19 @@
- type: Icon
sprite: ADT/Objects/Consumable/Drinks/elderguards.rsi
state: icon

- type: entity
parent: DrinkGlass
id: ADTDrinkLimeShadeGlass
suffix: LimeShade
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: ADTLimeShade
Quantity: 30
- type: Icon
sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi
state: icon
6 changes: 6 additions & 0 deletions Resources/Prototypes/ADT/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,9 @@
id: adt_elderguards
flavorType: Complex
description: flavor-complex-elderguards

- type: flavor
id: adt_limeshade
flavorType: Complex
description: flavor-complex-limeshade

23 changes: 23 additions & 0 deletions Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,26 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.2

- type: reagent
id: ADTLimeShade
name: lime-shade-name
parent: BaseAlcohol
desc: lime-shade-desc
physicalDesc: reagent-physical-desc-exotic-smelling
flavor: adt_limeshade
color: "#5c1e52"
metamorphicSprite:
sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
18 changes: 18 additions & 0 deletions Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,21 @@
amount: 1
products:
ADTElderGuards: 10 #polar bear heater. типо напиток из фильма, который по факту был придуман как шутка.

- type: reaction
id: ADTLimeShade
requiredMixerCategories:
- Shake
reactants:
JuiceLime:
amount: 1
ShadekinBlood:
amount: 1
Wine:
amount: 2
CoffeeLiqueur:
amount: 1
products:
ADTLimeShade: 5


Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"size":
{
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Filo.",
"states":
[
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
},
{
"name": "fill-5"
}
]
}
Loading