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.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
@@ -15,6 +15,7 @@ public sealed class UseDelayOnShootSystem : EntitySystem

    private void OnUseShoot(EntityUid uid, UseDelayOnShootComponent component, ref GunShotEvent args)
    {
-        _delay.BeginDelay(uid);
+        if (TryComp(uid, out UseDelayComponent? useDelay))
+            _delay.TryResetDelay((uid, useDelay));
    }
 }