From b1f30bf3969a18ebb4236cb926859f6a8c9d4edc Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Thu, 7 May 2020 10:58:30 -0500 Subject: [PATCH] Supplemental PR for microwave. Reagent containers/ recipes/ reagents etc... --- .../Entities/Items/Consumables/food.yml | 56 ++++++------ .../kitchen_reagent_containers.yml | 22 +++++ Resources/Prototypes/Kitchen/meal_recipes.yml | 88 ++++++++++++++++++- .../Reagents/{food.yml => food_reagents.yml} | 0 4 files changed, 139 insertions(+), 27 deletions(-) create mode 100644 Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml rename Resources/Prototypes/Reagents/{food.yml => food_reagents.yml} (100%) diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml index d07c9a4fe9..6a597b9141 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml @@ -1482,19 +1482,21 @@ - type: Icon sprite: Objects/Food/loadedbakedpotato.rsi -# - type: entity -# parent: FoodBase -# id: FoodMeat -# name: Meat -# description: A slab of meat. -# components: -# - type: Food -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Food/meat.rsi -# - type: Icon -# sprite: Objects/Food/meat.rsi +- type: entity + parent: FoodBase + id: FoodMeat + name: Meat + description: A slab of meat. + components: + - type: Food + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Food/meat.rsi + - type: Icon + sprite: Objects/Food/meat.rsi - type: entity parent: FoodBase @@ -2835,19 +2837,21 @@ - type: Icon sprite: Objects/Food/xenobreadslice.rsi -#- type: entity -# parent: FoodBase -# id: FoodXenomeat -# name: Xenomeat -# description: '' -# components: -# - type: Food -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Food/xenomeat.rsi -# - type: Icon -# sprite: Objects/Food/xenomeat.rsi +- type: entity + parent: FoodBase + id: FoodXenomeat + name: Xenomeat + description: Yum. + components: + - type: Food + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 20 + - type: Sprite + sprite: Objects/Food/xenomeat.rsi + - type: Icon + sprite: Objects/Food/xenomeat.rsi - type: entity parent: FoodBase diff --git a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml new file mode 100644 index 0000000000..2d009d083e --- /dev/null +++ b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml @@ -0,0 +1,22 @@ +- type: entity + parent: BaseItem + id: ReagentContainerFlour + name: Flour + description: Not to be confused with flower. + components: + - type: Solution + maxVol: 50 + contents: + reagents: + - ReagentId: chem.Flour + Quantity: 50 + - type: Pourable + transferAmount: 5 + - type: Drink + despawn_empty: true + - type: Sprite + sprite: Objects/Food/flour.rsi + state: icon + - type: Icon + sprite: Objects/Food/flour.rsi + state: icon diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Kitchen/meal_recipes.yml index 7d936bc846..10140ecbe0 100644 --- a/Resources/Prototypes/Kitchen/meal_recipes.yml +++ b/Resources/Prototypes/Kitchen/meal_recipes.yml @@ -1,13 +1,99 @@ + +#Burgers - type: microwaveMealRecipe id: RecipeCheeseburger name: Cheeseburger Recipe result: FoodCheeseburger time: 5 reagents: - chem.Nutriment: 10 + chem.Flour: 5 + solids: + FoodMeat: 1 + +- type: microwaveMealRecipe + id: RecipeTofuBurger + name: Tofu Burger Recipe + result: FoodTofuBurger + time: 5 + reagents: + chem.Flour: 15 + solids: + Tofu: 1 + +- type: microwaveMealRecipe + id: RecipeXenoburger + name: Xenoburger Recipe + result: FoodXenoburger + time: 5 + reagents: + chem.Flour: 5 + solids: + FoodXenomeat: 1 + +- type: microwaveMealRecipe + id: RecipeSuperBiteBurger + name: Super Bite Burger Recipe + result: FoodSuperBiteBurger + time: 20 + reagents: + chem.Flour: 15 + chem.Salt: 5 + chem.Pepper: 5 + solids: + FoodMeat: 5 + FoodCheeseWedge: 3 + FoodTomato: 4 + FoodEgg: 2 + +#Breads & Sandwiches +- type: microwaveMealRecipe + id: RecipeBread + name: Bread Recipe + result: DrinkFoodContainerBread + time: 15 + reagents: + chem.Flour: 15 + +- type: microwaveMealRecipe + id: RecipeSandwich + name: Sandwich Recipe + result: FoodSandwich + time: 10 solids: FoodBreadSlice: 2 + FoodMeatSteak: 1 + FoodCheeseWedge: 1 +- type: microwaveMealRecipe + id: RecipeToastedSandwich + name: Toasted Sandwich Recipe + result: FoodToastedSandwich + time: 5 + solids: + FoodSandwich: 1 + +- type: microwaveMealRecipe + id: RecipeGrilledCheese + name: Grilled Cheese Recipe + result: FoodGrilledCheese + time: 5 + solids: + FoodBreadSlice: 2 + FoodCheeseWedge: 1 + + + +#Other +- type: microwaveMealRecipe + id: RecipeMeatSteak + name: Meat Steak Recipe + result: FoodMeatSteak + time: 10 + reagents: + chem.Salt: 1 + chem.Pepper: 1 + solids: + FoodMeat: 1 - type: microwaveMealRecipe id: RecipeMisoColaSoup diff --git a/Resources/Prototypes/Reagents/food.yml b/Resources/Prototypes/Reagents/food_reagents.yml similarity index 100% rename from Resources/Prototypes/Reagents/food.yml rename to Resources/Prototypes/Reagents/food_reagents.yml