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

[HOTFIX] Ensure that mobs wake up when zombified (#37346)

Browse Source 
zombie sleep fix
This commit is contained in:
Errant
2025-05-11 18:49:22 +02:00
committed by GitHub
parent d19a421671
commit c261cc21a0
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Bed/Sleep/SleepingSystem.cs
View File

@@ -21,6 +21,7 @@ using Content.Shared.StatusEffect;
using Content.Shared.Stunnable; using Content.Shared.Stunnable;
using Content.Shared.Traits.Assorted; using Content.Shared.Traits.Assorted;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Content.Shared.Zombies;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing; using Robust.Shared.Timing;
@@ -51,6 +52,7 @@ public sealed partial class SleepingSystem : EntitySystem
SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction); SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction);
SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged); SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged);
SubscribeLocalEvent<SleepingComponent, EntityZombifiedEvent>(OnZombified);
SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged); SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged);
SubscribeLocalEvent<SleepingComponent, MapInitEvent>(OnMapInit); SubscribeLocalEvent<SleepingComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt); SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
@@ -219,6 +221,16 @@ public sealed partial class SleepingSystem : EntitySystem
TryWaking((ent, ent.Comp)); TryWaking((ent, ent.Comp));
} }
/// <summary>
/// Wake up on being zombified.
/// In some cases, zombification might theoretically occur without a mob state change or being damaged
/// </summary>
/// //TODO Perhaps a generic component should be introduced that guarantees that a mob will wake up immediately and can't go to sleep again
private void OnZombified(Entity<SleepingComponent> ent, ref EntityZombifiedEvent args)
{
TryWaking((ent, ent.Comp), true);
}
/// <summary> /// <summary>
/// In crit, we wake up if we are not being forced to sleep. /// In crit, we wake up if we are not being forced to sleep.
/// And, you can't sleep when dead... /// And, you can't sleep when dead...