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

Суп из опилок #793

Merged
merged 4 commits into from
Dec 6, 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
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-FoodPelmeniBowl = pelmeni
.desc = Lots of meat, little dough.
ent-FoodSoupSawdust = sawdust soup
.desc = It smells like sawdust
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
flavor-complex-fourteen-loko-soda-plus = как бунт в тюрьме
flavor-complex-nastoyka-romashki = как ромашка
flavor-complex-sawdust = как 24-х часовая рабочая смена
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-FoodPelmeniBowl = пельмени
.desc = Много мяса, мало теста.
ent-FoodSoupSawdust = суп из опилок
.desc = Пахнет опилками
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
flavor-complex-fourteen-loko-soda-plus = как бунт в тюрьме
flavor-complex-nastoyka-romashki = как ромашка
flavor-complex-sawdust = как 24-х часовая рабочая смена
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,29 @@
- type: Tag
tags:
- Meat

- type: entity
name: sawdust soup
parent: FoodBowlBase
id: FoodSoupSawdust
description: It smells like sawdust
components:
- type: FlavorProfile
flavors:
- woodsawdust
- type: Sprite
sprite: _Sunrise/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: sawdust
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 7
- ReagentId: Water
Quantity: 10
- ReagentId: Vitamin
Quantity: 3
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Sunrise/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
id: chamomile_tincture
flavorType: Complex
description: flavor-complex-chamomile-tincture

- type: flavor
id: woodsawdust
flavorType: Complex
description: flavor-complex-sawdust
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Reagents/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- type: reagent
id: Celliminol
name: reagent-name-celliminol
group: Special
group: Medicine
desc: reagent-desc-celliminol
physicalDesc: reagent-physical-desc-celliminol
flavor: medicine
Expand Down
36 changes: 35 additions & 1 deletion Resources/Prototypes/_Sunrise/Recipes/Cooking/meat_recipes.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: microwaveMealRecipe
- type: microwaveMealRecipe
id: RecipePelmeni
name: pelmeni recipe
result: FoodPelmeniBowl
Expand All @@ -9,3 +9,37 @@
FoodBowlBig: 1
FoodMeatMeatball: 1
FoodDoughSlice: 3

- type: microwaveMealRecipe
id: RecipeSoupSawdust
name: sawdust soup recipe
result: FoodSoupSawdust
time: 15
reagents:
Water: 10
solids:
FoodBowlBig: 1
Log: 2

- type: microwaveMealRecipe
id: RecipeSoupSawdustSteel
name: sawdust soup recipe steel
result: FoodSoupSawdust
time: 15
reagents:
Water: 10
solids:
FoodBowlBig: 1
SteelLog: 2

- type: microwaveMealRecipe
id: RecipeSoupSawdustLog
name: sawdust soup recipe log
result: FoodSoupSawdust
time: 15
reagents:
Water: 10
solids:
FoodBowlBig: 1
SteelLog: 1
Log: 1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Pelmeni created by SonicDC#9046",
Expand All @@ -12,6 +12,9 @@
},
{
"name": "pelmeni"
},
{
"name": "sawdust"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading