UseDelay + ItemCooldown merge (#22502)

2024-01-03 21:33:09 -04:00
parent 42ec9b2967
commit 9c522c8b19
80 changed files with 324 additions and 589 deletions
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Xenoarchaeology.Equipment.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Interaction;
 using Content.Shared.Timing;
-using Robust.Shared.Player;

 namespace Content.Server.Xenoarchaeology.Equipment.Systems;

@@ -31,7 +30,11 @@ public sealed class NodeScannerSystem : EntitySystem
        args.Handled = true;

        var target = args.Target.Value;
-        _useDelay.BeginDelay(uid);
+
+        if (TryComp(uid, out UseDelayComponent? useDelay)
+            && !_useDelay.TryResetDelay((uid, useDelay), true))
+            return;
+
        _popupSystem.PopupEntity(Loc.GetString("node-scan-popup",
            ("id", $"{artifact.CurrentNodeId}")), target);
    }