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.

Sign up for GitHub

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

Kvass #9082

Merged
merged 6 commits into from
Jul 12, 2022
Merged

Kvass #9082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8036ab
add kvass
KIBORG04 Jun 23, 2022
f34e35f
nevermind
KIBORG04 Jun 23, 2022
68f8124
forgot about double 's'
KIBORG04 Jun 23, 2022
0b571d5
Update tanks.yml
KIBORG04 Jun 24, 2022
5b31b6f
gotovo
KIBORG04 Jul 10, 2022
e07a67f
Update meta.json
KIBORG04 Jul 10, 2022
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
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ reagent-desc-hot-ramen = Hot noodles.

reagent-name-pilk = pilk
reagent-desc-pilk = A sickening mixture of milk and cola.

reagent-name-kvass = kvass
reagent-desc-kvass = A cool refreshing drink with a taste of socialism.
14 changes: 13 additions & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_food.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,16 @@
cost: 5000
category: Food
group: market


- type: cargoProduct
name: kvass tank crate
id: FoodCrateKvassTank
description: A tank with refreshing kvass, which helps so much in the heat.
icon:
sprite: Structures/Storage/kvass.rsi
state: kvass
product: CrateFoodKvassTank
cost: 2000
category: Food
group: market

10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/food.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,13 @@
amount: 3
- id: KitchenKnife
amount: 1

- type: entity
id: CrateFoodKvassTank
name: kvass tank crate
parent: CrateGenericSteel
components:
- type: StorageFill
contents:
- id: KvassTankFull
amount: 1
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,3 +2117,18 @@
- ReagentId: CapsaicinOil
Quantity: 5

- type: entity
parent: DrinkGlassBase
id: DrinkKvassGlass
name: kvass glass
description: A cool refreshing drink with a taste of socialism.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 50
reagents:
- ReagentId: Kvass
Quantity: 50
- type: Sprite
sprite: Objects/Consumable/Drinks/kvass.rsi
23 changes: 23 additions & 0 deletions Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,26 @@
- type: ReagentTank
transferAmount: 100

# Kvass
- type: entity
id: KvassTank
parent: StorageTank
name: КВАС
suffix: Empty
description: A cool refreshing drink with a taste of socialism.
components:
- type: Sprite
sprite: Structures/Storage/kvass.rsi
state: kvass

- type: entity
parent: KvassTank
id: KvassTankFull
suffix: Full
components:
- type: SolutionContainerManager
solutions:
tank:
reagents:
- ReagentId: Kvass
Quantity: 1500
9 changes: 9 additions & 0 deletions Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,3 +317,12 @@
physicalDesc: strong-smelling
color: "#485000"
spritePath: rewriter.rsi

- type: reagent
id: Kvass
name: reagent-name-kvass
parent: BaseDrink
Copy link
Contributor

Choose a reason for hiding this comment

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

Is Kvass not slightly alcoholic?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In such barrels, kvass has a very very small percentage of alcohol that it is more like soda

desc: reagent-desc-kvass
physicalDesc: reagent-physical-desc-bubbly
color: "#381600"
spritePath: kvass.rsi
Binary file added Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae", "states": [{"name": "icon"}]}
Binary file added Resources/Textures/Structures/Storage/kvass.rsi/kvass.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/Structures/Storage/kvass.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "kvass"
}
]
}