diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 92c1632cd1..e234e7b6a5 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -1,4 +1,5 @@ using Content.Server.Chemistry.EntitySystems; +using Content.Server.Construction; using Content.Server.Kitchen.Components; using Content.Server.Popups; using Content.Shared.Destructible; @@ -23,7 +24,7 @@ namespace Content.Server.Kitchen.EntitySystems base.Initialize(); SubscribeLocalEvent(OnSolutionChange); - SubscribeLocalEvent(OnInteractUsing); + SubscribeLocalEvent(OnInteractUsing, after: new[]{typeof(AnchorableSystem)}); SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnSuicide); } @@ -93,6 +94,7 @@ namespace Content.Server.Kitchen.EntitySystems private void OnInteractUsing(EntityUid uid, MicrowaveComponent component, InteractUsingEvent args) { + if(args.Handled) return; if (!component.Powered) { _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-using-no-power"), uid, Filter.Entities(args.User)); @@ -111,6 +113,8 @@ namespace Content.Server.Kitchen.EntitySystems return; } + args.Handled = true; + component.Storage.Insert(args.Used); component.DirtyUi(); }