Merge pull request #892 from FL-OZ/microwave_hot_fix

Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs

@@ -80,6 +80,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
                 return;
             }
 
+            _menu.ToggleBusyDisableOverlayPanel(cstate.IsMicrowaveBusy);
             RefreshContentsDisplay(cstate.ReagentsReagents, cstate.ContainedSolids);
 
         }
@@ -101,9 +102,12 @@ namespace Content.Client.GameObjects.Components.Kitchen
             _menu.IngredientsList.Clear();
             foreach (var entityID in solids)
             {
-                var entity = _entityManager.GetEntity(entityID);
+                if (!_entityManager.TryGetEntity(entityID, out var entity))
+                {
+                    return;
+                }
 
-                if (entity.TryGetComponent(out IconComponent icon))
+                if (!entity.Deleted && entity.TryGetComponent(out IconComponent icon))
                 {
                     var solidItem = _menu.IngredientsList.AddItem(entity.Name, icon.Icon.Default);
 

Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs

@@ -26,6 +26,11 @@ namespace Content.Client.GameObjects.Components.Kitchen
         public ButtonGroup CookTimeButtonGroup { get; }
         private VBoxContainer CookTimeButtonVbox { get; }
 
+        private VBoxContainer ButtonGridContainer { get; }
+
+        private PanelContainer DisableCookingPanelOverlay { get;}
+
+
         public ItemList IngredientsList { get;}
 
         public ItemList IngredientsListReagents { get; }
@@ -35,6 +40,16 @@ namespace Content.Client.GameObjects.Components.Kitchen
         {
             Owner = owner;
             Title = Loc.GetString("Microwave");
+            DisableCookingPanelOverlay = new PanelContainer
+            {
+                MouseFilter = MouseFilterMode.Stop,
+                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.Black.WithAlpha(0.60f)},
+                SizeFlagsHorizontal = SizeFlags.Fill,
+                SizeFlagsVertical = SizeFlags.Fill,
+
+            };
+
+
             var hSplit = new HBoxContainer
             {
                 SizeFlagsHorizontal = SizeFlags.Fill,
@@ -76,7 +91,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
 
             hSplit.AddChild(vSplit);
 
-            var buttonGridContainer = new VBoxContainer
+            ButtonGridContainer = new VBoxContainer
             {
                 Align  = BoxContainer.AlignMode.Center,
                 SizeFlagsStretchRatio = 3
@@ -96,9 +111,9 @@ namespace Content.Client.GameObjects.Components.Kitchen
                 TextAlign = Label.AlignMode.Center,
             };
 
-            buttonGridContainer.AddChild(StartButton);
+            ButtonGridContainer.AddChild(StartButton);
-            buttonGridContainer.AddChild(EjectButton);
+            ButtonGridContainer.AddChild(EjectButton);
-            vSplit.AddChild(buttonGridContainer);
+            vSplit.AddChild(ButtonGridContainer);
 
             //Padding
             vSplit.AddChild(new Control
@@ -114,6 +129,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
                 Align = BoxContainer.AlignMode.Center,
             };
 
+
             var index = 0;
             for (var i = 0; i <= 12; i++)
             {
@@ -135,6 +151,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
             var cookTimeOneSecondButton = (Button)CookTimeButtonVbox.GetChild(0);
             cookTimeOneSecondButton.Pressed = true;
 
+
             _cookTimeInfoLabel = new Label
             {
                 Text = Loc.GetString($"COOK TIME: {VisualCookTime}"),
@@ -199,8 +216,15 @@ namespace Content.Client.GameObjects.Components.Kitchen
 
             vSplit.AddChild(TimerFacePlate);
             Contents.AddChild(hSplit);
+            Contents.AddChild(DisableCookingPanelOverlay);
 
         }
 
+        public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
+        {
+            DisableCookingPanelOverlay.Visible = shouldDisable;
+        }
+
+
     }
 }

Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs

@@ -19,11 +19,9 @@ using Robust.Server.GameObjects.Components.Container;
 using Content.Server.GameObjects.Components.Power;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Localization;
 using Content.Server.Interfaces;
 using Robust.Shared.Audio;
-using YamlDotNet.Serialization.NodeTypeResolvers;
 
 namespace Content.Server.GameObjects.Components.Kitchen
 {
@@ -101,7 +99,6 @@ namespace Content.Server.GameObjects.Components.Kitchen
             _audioSystem = _entitySystemManager.GetEntitySystem<AudioSystem>();
             _userInterface = Owner.GetComponent<ServerUserInterfaceComponent>()
                 .GetBoundUserInterface(MicrowaveUiKey.Key);
-            
             _userInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage;
         }
 
@@ -137,7 +134,6 @@ namespace Content.Server.GameObjects.Components.Kitchen
                         UpdateUserInterface();
                     }
                     break;
-                
                 case MicrowaveVaporizeReagentIndexedMessage msg:
                     if (HasContents)
                     {
@@ -146,7 +142,6 @@ namespace Content.Server.GameObjects.Components.Kitchen
                         UpdateUserInterface();
                     }
                     break;
-                
                 case MicrowaveSelectCookTimeMessage msg:
                     _currentCookTimerTime = msg.newCookTime;
                     ClickSound();
@@ -173,7 +168,7 @@ namespace Content.Server.GameObjects.Components.Kitchen
                 solidsVisualList.Add(item.Uid);
             }
 
-            _userInterface.SetState(new MicrowaveUpdateUserInterfaceState(_solution.Solution.Contents, solidsVisualList));
+            _userInterface.SetState(new MicrowaveUpdateUserInterfaceState(_solution.Solution.Contents, solidsVisualList, _busy));
         }
 
         void IActivate.Activate(ActivateEventArgs eventArgs)
@@ -279,7 +274,7 @@ namespace Content.Server.GameObjects.Components.Kitchen
                            (_currentCookTimerTime == (uint)recipeToCook.CookTime) ? true : false;
 
             SetAppearance(MicrowaveVisualState.Cooking);
-            _audioSystem.Play(_startCookingSound);
+            _audioSystem.Play(_startCookingSound, AudioParams.Default);
             Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), () =>
             {
 
@@ -295,12 +290,12 @@ namespace Content.Server.GameObjects.Components.Kitchen
 
                 var entityToSpawn = goodMeal ? recipeToCook.Result : _badRecipeName;
                 _entityManager.SpawnEntity(entityToSpawn, Owner.Transform.GridPosition);
-                _audioSystem.Play(_cookingCompleteSound);
+                _audioSystem.Play(_cookingCompleteSound, AudioParams.Default);
                 SetAppearance(MicrowaveVisualState.Idle);
                 _busy = false;
+                UpdateUserInterface();
             });
             UpdateUserInterface();
-            return;
         }
 
         private void VaporizeReagents()

Content.Shared/Kitchen/SharedMicrowaveComponent.cs

@@ -70,10 +70,12 @@ namespace Content.Shared.Kitchen
     {
         public readonly IReadOnlyList<Solution.ReagentQuantity> ReagentsReagents;
         public readonly List<EntityUid> ContainedSolids;
-        public MicrowaveUpdateUserInterfaceState(IReadOnlyList<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
+        public bool IsMicrowaveBusy;
+        public MicrowaveUpdateUserInterfaceState(IReadOnlyList<Solution.ReagentQuantity> reagents, List<EntityUid> solids, bool busyStatus)
         {
             ReagentsReagents = reagents;
             ContainedSolids = solids;
+            IsMicrowaveBusy = busyStatus;
         }
     }