tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Action Cooldowns Reset on Rejuvenate (#22149)

Browse Source 
* ActionComponents subscribe to RejuvenateEvent, resets cooldowns

* forgo a line

* Update Content.Shared/Actions/SharedActionsSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
This commit is contained in:
ForestNoises
2023-12-05 16:00:02 -05:00
committed by GitHub
parent 858474db3d
commit 685cb9c671
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -15,6 +15,7 @@ using Robust.Shared.GameStates;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Content.Shared.Rejuvenate;
namespace Content.Shared.Actions; namespace Content.Shared.Actions;
@@ -38,6 +39,7 @@ public abstract class SharedActionsSystem : EntitySystem
SubscribeLocalEvent<ActionsComponent, DidEquipHandEvent>(OnHandEquipped); SubscribeLocalEvent<ActionsComponent, DidEquipHandEvent>(OnHandEquipped);
SubscribeLocalEvent<ActionsComponent, DidUnequipEvent>(OnDidUnequip); SubscribeLocalEvent<ActionsComponent, DidUnequipEvent>(OnDidUnequip);
SubscribeLocalEvent<ActionsComponent, DidUnequipHandEvent>(OnHandUnequipped); SubscribeLocalEvent<ActionsComponent, DidUnequipHandEvent>(OnHandUnequipped);
SubscribeLocalEvent<ActionsComponent, RejuvenateEvent>(OnRejuventate);
SubscribeLocalEvent<ActionsComponent, ComponentShutdown>(OnShutdown); SubscribeLocalEvent<ActionsComponent, ComponentShutdown>(OnShutdown);
@@ -163,6 +165,14 @@ public abstract class SharedActionsSystem : EntitySystem
Dirty(actionId.Value, action); Dirty(actionId.Value, action);
} }
private void OnRejuventate(EntityUid uid, ActionsComponent component, RejuvenateEvent args)
{
foreach (var act in component.Actions)
{
ClearCooldown(act);
}
}
#region ComponentStateManagement #region ComponentStateManagement
protected virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null) protected virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
{ {