diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs index b3a9927a38..878096cd5b 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs @@ -105,7 +105,7 @@ namespace Content.Server.GameObjects.Components.Kitchen { if (CanSatisfyRecipe(r)) { - var outputFromRecipe = r.OutPutPrototype; + var outputFromRecipe = r.Result; _entityManager.SpawnEntity(outputFromRecipe, Owner.Transform.GridPosition); return; } diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs index 7b93cbbb3e..c7a20faf8f 100644 --- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs +++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs @@ -20,12 +20,12 @@ namespace Content.Shared.Kitchen private string _id; private string _name; - private string _output; + private string _result; private Dictionary _ingredients; public string ID => _id; public string Name => Loc.GetString(_name); - public string OutPutPrototype => _output; + public string Result => _result; public IReadOnlyDictionary Ingredients => _ingredients; public void LoadFrom(YamlMappingNode mapping) @@ -34,7 +34,7 @@ namespace Content.Shared.Kitchen serializer.DataField(ref _id, "id", string.Empty); serializer.DataField(ref _name, "name", string.Empty); - serializer.DataField(ref _output, "output", string.Empty); + serializer.DataField(ref _result, "result", string.Empty); serializer.DataField(ref _ingredients, "ingredients", new Dictionary()); } } diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Kitchen/meal_recipes.yml index 2b088ed8be..2c1c261fcc 100644 --- a/Resources/Prototypes/Kitchen/meal_recipes.yml +++ b/Resources/Prototypes/Kitchen/meal_recipes.yml @@ -1,17 +1,7 @@ - type: microwaveMealRecipe id: RecipeCheeseburger name: "Cheeseburger Recipe" - output: FoodCheeseburger + result: FoodCheeseburger ingredients: - chem.H2O: 15 + chem.Flour: 15 chem.Nutriment: 5 - -- type: microwaveMealRecipe - id: RecipeFlashlight - name: "Flashlight Recipe" - output: FlashlightLantern - ingredients: - chem.H2O: 15 - chem.Nutriment: 20 - chem.Glucose: 5 - diff --git a/Resources/Prototypes/Reagents/food.yml b/Resources/Prototypes/Reagents/food.yml new file mode 100644 index 0000000000..6c838830da --- /dev/null +++ b/Resources/Prototypes/Reagents/food.yml @@ -0,0 +1,8 @@ +- type: reagent + id: chem.Flour + name: Flour + desc: Used for baking. + color: "#FFFFFF" + metabolism: + - !type:DefaultFood + rate: 1