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

Content fixes for timeoffsets (#15934)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-01 14:49:25 +10:00
committed by GitHub
parent 2cf883b56a
commit d51d74d934
18 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Damage/Systems/StaminaSystem.cs
View File

@@ -41,6 +41,7 @@ public sealed class StaminaSystem : EntitySystem
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<StaminaComponent, EntityUnpausedEvent>(OnStamUnpaused);
SubscribeLocalEvent<StaminaComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<StaminaComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<StaminaComponent, ComponentGetState>(OnStamGetState);
@@ -51,6 +52,11 @@ public sealed class StaminaSystem : EntitySystem
SubscribeLocalEvent<StaminaDamageOnHitComponent, MeleeHitEvent>(OnHit);
}
private void OnStamUnpaused(EntityUid uid, StaminaComponent component, ref EntityUnpausedEvent args)
{
component.NextUpdate += args.PausedTime;
}
private void OnStamGetState(EntityUid uid, StaminaComponent component, ref ComponentGetState args)
{
args.State = new StaminaComponentState()
@@ -206,7 +212,7 @@ public sealed class StaminaSystem : EntitySystem
{
if (!args.OurFixture.ID.Equals(CollideFixture)) return;
TakeStaminaDamage(args.OtherFixture.Body.Owner, component.Damage, source:args.OurFixture.Body.Owner);
TakeStaminaDamage(args.OtherEntity, component.Damage, source:args.OurEntity);
}
private void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null)