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

add more skewerable things to modular kebabs #32978

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private bool TryMetamorph(Entity<FoodSequenceStartPointComponent> start)
List<MetamorphRecipePrototype> availableRecipes = new();
foreach (var recipe in _proto.EnumeratePrototypes<MetamorphRecipePrototype>())
{
if (recipe.Key != start.Comp.Key)
if (recipe.Key != start.Comp.Key) //Checking against recipes in sequence_metamorph.yml
continue;

bool allowed = true;
Expand Down Expand Up @@ -115,7 +115,7 @@ private bool TryAddFoodElement(Entity<FoodSequenceStartPointComponent> start, En
if (elementFood.RequireDead && _mobState.IsAlive(element))
return false;

//looking for a suitable FoodSequence prototype
//looking for a suitable FoodSequence prototype within food_sequence_element.yml
if (!element.Comp.Entries.TryGetValue(start.Comp.Key, out var elementProto))
return false;
if (!_proto.TryIndex(elementProto, out var elementIndexed))
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/nutrition/components/food-sequence.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,5 @@ food-sequence-taco-gen = taco with {$content}
# SKEWER

food-sequence-skewer-gen = {$content} kebab

food-sequence-skewer-content-meatball = meatball
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@
entries:
Taco: CheeseTaco
Burger: CheeseBurger
Skewer: CheeseSkewer

- type: entity
name: chèvre log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,9 @@
Quantity: 10
- ReagentId: Toxin
Quantity: 2
- type: FoodSequenceElement
entries:
Skewer: MeatSnake

- type: entity
name: raw xeno meat
Expand Down Expand Up @@ -899,6 +902,7 @@
entries:
Burger: MeatChicken
Taco: MeatChicken
Skewer: MeatChickenSkewer

- type: entity
name: fried chicken
Expand Down Expand Up @@ -1118,6 +1122,7 @@
entries:
Burger: MeatSpiderBurger
Taco: MeatSpider
Skewer: MeatSpider

- type: entity
name: meatball
Expand All @@ -1143,6 +1148,7 @@
entries:
Burger: MeatBall
Taco: MeatBall
Skewer: MeatBallSkewer

- type: entity
name: boiled snail
Expand Down
41 changes: 40 additions & 1 deletion Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
- sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-rat

# Raw Snake

- type: foodSequenceElement
id: MeatSnake
name: food-sequence-content-snake
sprites:
- sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-snake

# Cheese

- type: foodSequenceElement
Expand All @@ -56,6 +65,15 @@
tags:
- Cheese

- type: foodSequenceElement
id: CheeseSkewer
name: food-sequence-content-cheese
sprites:
- sprite: Objects/Consumable/Food/ingredients.rsi
state: cheesewedge
tags:
- Cheese

# Steak

- type: foodSequenceElement
Expand Down Expand Up @@ -137,6 +155,17 @@
- Meat
- Chicken

- type: foodSequenceElement
id: MeatChickenSkewer
name: food-sequence-content-chicken
sprites:
- sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-meat
tags:
- Cooked
- Meat
- Chicken

# Fried Chicken meat

- type: foodSequenceElement
Expand Down Expand Up @@ -277,6 +306,16 @@
- Cooked
- Meat

- type: foodSequenceElement
id: MeatBallSkewer
name: food-sequence-skewer-content-meatball
sprites:
- sprite: Objects/Consumable/Food/meat.rsi
state: meatball-cooked
tags:
- Cooked
- Meat

# Snail meat

- type: foodSequenceElement
Expand Down Expand Up @@ -376,7 +415,7 @@
- Cutlet
- Meat

# Spider cutlet
# Lizard cutlet

- type: foodSequenceElement
id: LizardCutlet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@
max: 2
- !type:LastElementHasTags # last bun
tags:
- Bun
- Bun