From 21eb662377ed0d267744287c870b0c9916444211 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 2 Aug 2025 15:59:48 -0700
Subject: [PATCH] Fix ActionsSystem.IsCooldownActive always returning false if
 curTime is null (#39329)

---
 Content.Shared/Actions/SharedActionsSystem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 69b15235c4..c4581cfbff 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -1022,6 +1022,7 @@ public abstract class SharedActionsSystem : EntitySystem
     public bool IsCooldownActive(ActionComponent action, TimeSpan? curTime = null)
     {
         // TODO: Check for charge recovery timer
+        curTime ??= GameTiming.CurTime;
         return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime;
     }
 
-- 
2.51.2