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

The first of all father soup #2099

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
Expand Up @@ -27,3 +27,4 @@
DrinkMugOne: 1
DrinkMugRainbow: 2
DrinkMugRed: 2
FoodCauldron: 2 # SS220 Fist of all FatherSoup
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
reagents:
- ReagentId: JuiceBeet
Quantity: 10

- type: entity
name: сноп мясопшеницы
description: Эх... мясопшеница... стоп, что?
Expand All @@ -52,3 +52,16 @@
- type: Tag
tags:
- Meatwheat

- type: entity
name: Призрачный чили перец
description: Призрачный чили перец? А как мне из него готовить, если я его не вижу?
Comment on lines +57 to +58
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию

id: GhostChiliPepper
parent: ProduceBase
components:
- type: Sprite
sprite: SS220/Objects/Specific/Hydroponics/ghostchilipepper.rsi
- type: SolutionContainerManager
solutions:
- ReagentId: Nutriment
Quantity: 5
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
Quantity: 5

- type: entity
name: винегрет
parent: FoodBowlBase
id: FoodSaladVinaigrette
description: Кладезь витаминов и микроэлементов. А почему тут нет вина?
description: Кладезь витаминов и микроэлементов. А почему тут нет вина?
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию

components:
- type: FlavorProfile
flavors:
Expand All @@ -92,4 +92,58 @@
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
Quantity: 5

- type: entity
name: cуп Космического Отца
id: FoodFatherSoup
parent: FoodBowlBase
description: Суп придает настолько много сил, что его пришлось поместить в чан. Наверное мне стоит его съесть?
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию

components:
- type: FlavorProfile
flavors:
- fatherSoup
- type: Sprite
sprite: SS220/Objects/Consumable/Food/cauldron.rsi
layers:
- state: cauldron
- state: father
- type: SolutionContainerManager
solutions:
food:
maxVol: 25
reagents:
- ReagentId: Nutriment
Quantity: 15
- ReagentId: Protein
Quantity: 10
Comment on lines +116 to +119
Copy link
Collaborator

Choose a reason for hiding this comment

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

Не маловато ли?
Прост ингредиентов много же используется.....

- type: Food
trash:
- FoodCauldron
- type: Tag
tags:
- Meat

- type: entity
name: Призрачный чили перец
description: Призрачный чили перец? А как мне из него готовить, если я его не вижу?
Comment on lines +128 to +129
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию

id: GhostChiliPepper
parent: FoodProduceBase
components:
- type: Sprite
sprite: SS220/Objects/Specific/Hydroponics/ghost_peppers.rsi
state: produce
- type: FlavorProfile
flavors:
- ghostChili
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 5
- type: Produce
seedId: chili
- type: StaticPrice
price: 500 #It has so much Omnizin in it

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: FoodBowlBig
id: FoodCauldron
name: Чан
description: Большой чан для готовки. Поместится много еды, осталось только приготовить.
Comment on lines +4 to +5
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию

components:
- type: Sprite
sprite: SS220/Objects/Consumable/Food/cauldron.rsi
layers:
- state: cauldron
10 changes: 10 additions & 0 deletions Resources/Prototypes/SS220/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@
flavorType: Complex
description: терпко-сладко

- type: flavor
id: fatherSoup
flavorType: Complex
description: умопомрачительно, ослепительно, бурно, мощно
Copy link
Collaborator

Choose a reason for hiding this comment

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

перенести в локализацию


- type: flavor
id: ghostChili
flavorType: Complex
description: призрачно остро
Copy link
Collaborator

Choose a reason for hiding this comment

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

и это


- type: flavor
id: HolyMoly
flavorType: Base
Expand Down
24 changes: 20 additions & 4 deletions Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
result: FoodCheburek
time: 15
reagents:
TableSalt: 5
TableSalt: 5
solids:
FoodDough: 1
FoodMeatCutlet: 1
Expand All @@ -16,7 +16,7 @@
result: FoodShawarma
time: 15
reagents:
Mayo: 5
Mayo: 5
solids:
FoodDough: 1
FoodMeatChicken: 1
Expand Down Expand Up @@ -70,7 +70,7 @@
result: FoodSoupOkroshkaKvass
time: 10
reagents:
Kvass: 10
Kvass: 10
solids:
FoodBowlBig: 1
FoodMeatChicken: 1
Expand Down Expand Up @@ -155,6 +155,22 @@
FoodCheeseSlice: 1
#SS220 Nachos-recipe end

- type: microwaveMealRecipe
id: RecipeFatherSoup
name: father soup recipe
result: FoodFatherSoup
time: 30
reagents:
Blackpepper: 5
Flour: 10
solids:
FoodSoupTomato: 1
FoodGarlic: 1
FoodOnion: 1
FoodTomato: 1
FoodChiliPepper: 2
Сauldron: 1

#SS220 Spicy UPD start
- type: microwaveMealRecipe
id: RecipeSpicyPizza
Expand All @@ -168,4 +184,4 @@
FoodMeat: 3
FoodCheeseSlice: 1
FoodTomato: 1
#SS220 Spicy UPD end
#SS220 Spicy UPD end
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,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "pot taken from Aurora Station at //github.com/Aurorastation/Aurora.3/blob/HEAD/icons/obj/item/reagent_containers/cooking_container.dmi, father states sprited by Estkemran (Github) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "cauldron"
},
{
"name": "father"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Sprited by Estkemran (Github) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "produce"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading