diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 02fe067ce7..723fff8854 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -300,9 +300,6 @@ namespace Content.Server.GameObjects.Components.Kitchen recipeToCook = r; } - var goodMeal = (recipeToCook != null) - && - (_currentCookTimerTime == (uint)recipeToCook.CookTime); SetAppearance(MicrowaveVisualState.Cooking); _audioSystem.PlayFromEntity(_startCookingSound, Owner, AudioParams.Default); Owner.SpawnTimer((int)(_currentCookTimerTime * _cookTimeMultiplier), (Action)(() => @@ -319,20 +316,16 @@ namespace Content.Server.GameObjects.Components.Kitchen } else { - if (goodMeal) + if (recipeToCook != null) { - SubtractContents(recipeToCook!); + SubtractContents(recipeToCook); + Owner.EntityManager.SpawnEntity(recipeToCook.Result, Owner.Transform.Coordinates); } else { VaporizeReagents(); VaporizeSolids(); - } - - if (recipeToCook != null) - { - var entityToSpawn = goodMeal ? recipeToCook.Result : _badRecipeName; - Owner.EntityManager.SpawnEntity(entityToSpawn, Owner.Transform.Coordinates); + Owner.EntityManager.SpawnEntity(_badRecipeName, Owner.Transform.Coordinates); } } _audioSystem.PlayFromEntity(_cookingCompleteSound, Owner, AudioParams.Default.WithVolume(-1f)); @@ -427,6 +420,11 @@ namespace Content.Server.GameObjects.Components.Kitchen private MicrowaveSuccessState CanSatisfyRecipe(FoodRecipePrototype recipe, Dictionary solids) { + if (_currentCookTimerTime != (uint) recipe.CookTime) + { + return MicrowaveSuccessState.RecipeFail; + } + if (!Owner.TryGetComponent(out SolutionContainerComponent? solution)) { return MicrowaveSuccessState.RecipeFail; @@ -458,7 +456,6 @@ namespace Content.Server.GameObjects.Components.Kitchen } } - return MicrowaveSuccessState.RecipePass; }