diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs index 3913afbd07..ee99418970 100644 --- a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs @@ -19,7 +19,7 @@ public sealed partial class ReactionMixerSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnAfterInteract, before: [typeof(IngestionSystem)]); SubscribeLocalEvent(OnShake); SubscribeLocalEvent(OnDoAfter); } @@ -29,12 +29,13 @@ public sealed partial class ReactionMixerSystem : EntitySystem if (!args.Target.HasValue || !args.CanReach || !entity.Comp.MixOnInteract) return; - if (!MixAttempt(entity, args.Target.Value, out var solution)) + if (!MixAttempt(entity, args.Target.Value, out _)) return; var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.TimeToMix, new ReactionMixDoAfterEvent(), entity, args.Target.Value, entity); _doAfterSystem.TryStartDoAfter(doAfterArgs); + args.Handled = true; } private void OnDoAfter(Entity entity, ref ReactionMixDoAfterEvent args)