ninja 2 electric boogaloo (#15534)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 07:20:27 +01:00
parent 25c8a03276
commit 24810d916b
153 changed files with 3892 additions and 78 deletions
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -140,7 +140,7 @@ public sealed partial class TriggerSystem

    private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args)
    {
-        if (args.Handled)
+        if (args.Handled || HasComp<AutomatedTimerComponent>(uid))
            return;

        HandleTimerTrigger(