From b1f30bf3969a18ebb4236cb926859f6a8c9d4edc Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Thu, 7 May 2020 10:58:30 -0500 Subject: [PATCH 1/3] 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 From 584f3a2240ac94ace9a766dd394b869375a80bde Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Fri, 8 May 2020 18:12:54 -0500 Subject: [PATCH 2/3] moar recipes 1 --- Resources/Prototypes/Kitchen/meal_recipes.yml | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Kitchen/meal_recipes.yml index 10140ecbe0..f66e298755 100644 --- a/Resources/Prototypes/Kitchen/meal_recipes.yml +++ b/Resources/Prototypes/Kitchen/meal_recipes.yml @@ -81,6 +81,88 @@ FoodBreadSlice: 2 FoodCheeseWedge: 1 +- type: microwaveMealRecipe + id: RecipeBaguette + name: Baguette Recipe + result: FoodBaguette + time: 10 + reagents: + chem.Flour: 15 + chem.Salt: 1 + chem.Pepper: 1 + +- type: microwaveMealRecipe + id: RecipeCreamCheeseBread + name: Cream Cheese Bread Recipe + result: DrinkFoodContainerCreamCheeseBread + time: 20 + reagents: + chem.Flour: 15 + solids: + FoodCheeseWedge: 2 + +- type: microwaveMealRecipe + id: RecipeBananaBread + name: Banana Bread Recipe + result: DrinkFoodContainerBananaBread + time: 25 + reagents: + chem.Flour: 15 + chem.Milk: 5 + solids: + FoodEgg: 3 + FoodBanana: 1 + + + +#Pizzas +- type: microwaveMealRecipe + id: MargheritaPizzaRecipe + name: Margherita Pizza Recipe + result: DrinkFoodContainerMargheritaPizza + time: 30 + reagents: + chem.Flour: 10 + solids: + FoodCheeseWedge: 4 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: MushroomPizzaRecipe + name: Mushroom Pizza Recipe + result: DrinkFoodContainerMushroomPizza + time: 25 + reagents: + chem.Flour: 10 + solids: + FoodMushroom: 5 + +- type: microwaveMealRecipe + id: MeatPizzaRecipe + name: Meat Pizza Recipe + result: DrinkFoodContainerMeatPizza + time: 30 + reagents: + chem.Flour: 10 + solids: + FoodMeat: 3 + FoodCheeseWedge: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: VegetablePizzaRecipe + name: Vegetable Pizza Recipe + result: DrinkFoodContainerVegetablePizza + time: 30 + reagents: + chem.Flour: 10 + solids: + FoodEggplant: 1 + FoodCarrot: 1 + FoodCorn: 1 + FoodTomato: 1 + +#Italian #Other From c9c1d0dfd7a0e57ba71cb3ede33ad100dde2c226 Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Sun, 10 May 2020 00:38:41 -0500 Subject: [PATCH 3/3] moar recipes --- Resources/Prototypes/Kitchen/meal_recipes.yml | 159 +++++++++++++++++- 1 file changed, 154 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Kitchen/meal_recipes.yml index f66e298755..707a4c3b47 100644 --- a/Resources/Prototypes/Kitchen/meal_recipes.yml +++ b/Resources/Prototypes/Kitchen/meal_recipes.yml @@ -117,7 +117,7 @@ #Pizzas - type: microwaveMealRecipe - id: MargheritaPizzaRecipe + id: RecipeMargheritaPizza name: Margherita Pizza Recipe result: DrinkFoodContainerMargheritaPizza time: 30 @@ -128,7 +128,7 @@ FoodTomato: 1 - type: microwaveMealRecipe - id: MushroomPizzaRecipe + id: RecipeMushroomPizza name: Mushroom Pizza Recipe result: DrinkFoodContainerMushroomPizza time: 25 @@ -138,7 +138,7 @@ FoodMushroom: 5 - type: microwaveMealRecipe - id: MeatPizzaRecipe + id: RecipeMeatPizza name: Meat Pizza Recipe result: DrinkFoodContainerMeatPizza time: 30 @@ -150,7 +150,7 @@ FoodTomato: 1 - type: microwaveMealRecipe - id: VegetablePizzaRecipe + id: RecipeVegetablePizza name: Vegetable Pizza Recipe result: DrinkFoodContainerVegetablePizza time: 30 @@ -163,7 +163,145 @@ FoodTomato: 1 #Italian +- type: microwaveMealRecipe + id: RecipeSpaghetti + name: Spaghetti Recipe + result: FoodSpaghetti + time: 1 + reagents: + chem.Flour: 5 +- type: microwaveMealRecipe + id: RecipeBoiledSpaghetti + name: Boiled Spaghetti Recipe + result: FoodSpagettiBoiled + time: 5 + reagents: + chem.H2O: 5 + solids: + FoodSpagetti: 1 + +- type: microwaveMealRecipe + id: RecipePastaTomato + name: Pasta Tomato Recipe + result: FoodPastaTomato + time: 10 + reagents: + chem.H2O: 5 + solids: + FoodSpagetti: 1 + FoodTomato: 2 + +- type: microwaveMealRecipe + id: RecipeMeatballSpaghetti + name: Spaghetti & Meatballs Recipe + result: FoodMeatballSpaghetti + time: 10 + reagents: + chem.H2O: 5 + solids: + FoodSpagetti: 1 + FoodMeatball: 2 + +- type: microwaveMealRecipe + id: RecipeCrabSpaghetti + name: Crab Spaghetti Recipe + result: FoodCrabSpaghetti + time: 10 + reagents: + chem.H2O: 5 + solids: + FoodCrabMeat: 2 + +- type: microwaveMealRecipe + id: RecipeCopypasta + name: Copypasta Recipe + result: FoodCopypasta + time: 10 + solids: + FoodPastaTomato: 2 + +# - type: microwaveMealRecipe +# id: RecipeMoMMISpaghetti +# name: MoMMI Spaghetti Recipe +# result: FoodMoMMISpaghetti +# time: 10 +# reagents: +# chem.Flour: 5 +# solids: + +- type: microwaveMealRecipe + id: RecipeRisotto + name: Risotto Recipe + result: FoodRisotto + time: 10 + reagents: + chem.Flour: 10 #This should be 10 units of rice. + chem.Wine: 5 + solids: + FoodCheeseWedge: 1 + +- type: microwaveMealRecipe + id: RecipeBruschetta + name: Bruschetta Recipe + result: FoodBruschetta + time: 10 + reagents: + chem.Flour: 10 + chem.Salt: 2 + solids: + FoodGarlic: 1 + FoodCheeseWedge: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeQuiche + name: Quiche Recipe + result: FoodQuiche + time: 10 + solids: + FoodBlueTomato: 1 + FoodGarlic: 1 + FoodEgg: 1 + FoodCheeseWedge: 1 + +- type: microwaveMealRecipe + id: RecipeLasagna + name: Lasagna Recipe + result: FoodLasagna + time: 15 + # reagents: + # chem.TomatoJuice: 15 + solids: + FoodFlatDough: 2 + FoodMeat: 2 + FoodEggPlant: 1 + FoodCheeseWedge: 1 + +#Soups & Stew +- type: microwaveMealRecipe + id: RecipeMeatballSoup + name: Meatball Soup Recipe + result: FoodMeatballSoup + time: 10 + reagents: + chem.H2O: 10 + solids: + FoodMeatball: 1 + FoodCarrot: 1 + FoodPotato: 1 + +- type: microwaveMealRecipe + id: RecipeNettleSoup + name: Nettle Soup Recipe + result: FoodNettleSoup + time: 10 + reagents: + chem.H2O: 10 + solids: + FoodNettle: 1 + FoodEgg: 1 + FoodPotato: 1 #Other - type: microwaveMealRecipe @@ -179,7 +317,7 @@ - type: microwaveMealRecipe id: RecipeMisoColaSoup - name: Salty Sweet MisoCola Soup Recipe + name: Salty Sweet MiloCola Soup Recipe result: DisgustingSweptSoup time: 15 reagents: @@ -187,3 +325,14 @@ solids: FoodMiloSoup: 1 + + +#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you. +# - type: microwaveMealRecipe +# id: +# name: +# result: +# time: 5 +# reagents: + +# solids: