Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

This reverts commit 1579da881a, reversing
changes made to a9bdab0705.
This commit is contained in:
Ed
2024-11-06 16:52:08 +03:00
parent 1579da881a
commit ae27cf7e08
40 changed files with 840 additions and 3436 deletions

View File

@@ -213,7 +213,14 @@ namespace Content.Server.Ghost
private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args)
{
_actions.AddAction(uid, ref component.BooActionEntity, component.BooAction);
if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction)
&& act.UseDelay != null)
{
var start = _gameTiming.CurTime;
var end = start + act.UseDelay.Value;
_actions.SetCooldown(component.BooActionEntity.Value, start, end);
}
_actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction);
_actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);
_actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction);