diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 006450a77d..928c785c46 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -207,6 +207,14 @@ namespace Content.Server.Interaction private void InteractionActivate(IEntity user, IEntity used) { + if (used.TryGetComponent(out var delayComponent)) + { + if (delayComponent.ActiveDelay) + return; + + delayComponent.BeginDelay(); + } + if (!_actionBlockerSystem.CanInteract(user) || ! _actionBlockerSystem.CanUse(user)) return; @@ -595,8 +603,8 @@ namespace Content.Server.Interaction { if (delayComponent.ActiveDelay) return; - else - delayComponent.BeginDelay(); + + delayComponent.BeginDelay(); } var useMsg = new UseInHandEvent(user, used);