Skip to content

Commit

Permalink
Reverted Block emotes for sleeping (upstream PR #32779)
Browse files Browse the repository at this point in the history
  • Loading branch information
Radezolid committed Nov 1, 2024
1 parent af2746c commit 9cb71a8
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Content.Shared/Bed/Sleep/SleepingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Content.Shared.Buckle.Components;
using Content.Shared.Damage;
using Content.Shared.Damage.ForceSay;
using Content.Shared.Emoting;
//using Content.Shared.Emoting; # DeltaV - Reverted "Block emotes for sleeping" (upstream PR #32779)
using Content.Shared.Examine;
using Content.Shared.Eye.Blinding.Systems;
using Content.Shared.IdentityManagement;
Expand Down Expand Up @@ -62,7 +62,7 @@ public override void Initialize()

SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnEmoteAttempt);
//SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnEmoteAttempt); # DeltaV - Reverted "Block emotes for sleeping" (upstream PR #32779)
}

private void OnUnbuckleAttempt(Entity<SleepingComponent> ent, ref UnbuckleAttemptEvent args)
Expand Down Expand Up @@ -312,14 +312,15 @@ public bool TryWaking(Entity<SleepingComponent?> ent, bool force = false, Entity
Wake((ent, ent.Comp));
return true;
}

/* DeltaV - Reverted "Block emotes for sleeping" (upstream PR #32779)
/// <summary>
/// Prevents the use of emote actions while sleeping
/// </summary>
public void OnEmoteAttempt(Entity<SleepingComponent> ent, ref EmoteAttemptEvent args)
{
args.Cancel();
}
*/
}


Expand Down

0 comments on commit 9cb71a8

Please sign in to comment.