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

Fix actions not being usable, ordering, and containers (#19964)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-09 16:14:17 -07:00
committed by GitHub
parent 7b41f7451c
commit 09bce85f19
21 changed files with 166 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Ghost/GhostSystem.cs
View File

@@ -47,7 +47,6 @@ namespace Content.Server.Ghost
SubscribeLocalEvent<GhostComponent, ComponentStartup>(OnGhostStartup);
SubscribeLocalEvent<GhostComponent, ComponentShutdown>(OnGhostShutdown);
SubscribeLocalEvent<GhostComponent, MapInitEvent>(OnGhostMapInit);
SubscribeLocalEvent<GhostComponent, ExaminedEvent>(OnGhostExamine);
@@ -121,7 +120,20 @@ namespace Content.Server.Ghost
eye.VisibilityMask |= (uint) VisibilityFlags.Ghost;
}
component.TimeOfDeath = _gameTiming.CurTime;
var time = _gameTiming.CurTime;
component.TimeOfDeath = time;
// TODO ghost: remove once ghosts are persistent and aren't deleted when returning to body
var action = _actions.AddAction(uid, ref component.ActionEntity, component.Action);
if (action?.UseDelay != null)
{
action.Cooldown = (time, time + action.UseDelay.Value);
Dirty(component.ActionEntity!.Value, action);
}
_actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);
_actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction);
_actions.AddAction(uid, ref component.ToggleGhostsActionEntity, component.ToggleGhostsAction);
}
private void OnGhostShutdown(EntityUid uid, GhostComponent component, ComponentShutdown args)
@@ -147,22 +159,6 @@ namespace Content.Server.Ghost
}
}
private void OnGhostMapInit(EntityUid uid, GhostComponent component, MapInitEvent args)
{
// TODO ghost: remove once ghosts are persistent and aren't deleted when returning to body
var time = _gameTiming.CurTime;
var action = _actions.AddAction(uid, ref component.ActionEntity, component.Action);
if (action?.UseDelay != null)
{
action.Cooldown = (time, time + action.UseDelay.Value);
Dirty(component.ActionEntity!.Value, action);
}
_actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);
_actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction);
_actions.AddAction(uid, ref component.ToggleGhostsActionEntity, component.ToggleGhostsAction);
}
private void OnGhostExamine(EntityUid uid, GhostComponent component, ExaminedEvent args)
{
var timeSinceDeath = _gameTiming.RealTime.Subtract(component.TimeOfDeath);