From f07104d45b2a967de03f73ced7dd3587005ab70f Mon Sep 17 00:00:00 2001 From: metalgearsloth Date: Sun, 24 Oct 2021 17:16:47 +1100 Subject: [PATCH] Prevent emoting while dead Fixes 4992 --- Content.Shared/MobState/EntitySystems/MobStateSystem.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Content.Shared/MobState/EntitySystems/MobStateSystem.cs b/Content.Shared/MobState/EntitySystems/MobStateSystem.cs index 033bc3bb45..91dac34ca2 100644 --- a/Content.Shared/MobState/EntitySystems/MobStateSystem.cs +++ b/Content.Shared/MobState/EntitySystems/MobStateSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; using Content.Shared.DragDrop; +using Content.Shared.Emoting; using Content.Shared.Interaction.Events; using Content.Shared.Inventory.Events; using Content.Shared.Item; @@ -26,6 +27,7 @@ namespace Content.Shared.MobState.EntitySystems SubscribeLocalEvent(OnThrowAttempt); SubscribeLocalEvent(OnSpeakAttempt); SubscribeLocalEvent(OnEquipAttempt); + SubscribeLocalEvent(OnEmoteAttempt); SubscribeLocalEvent(OnUnequipAttempt); SubscribeLocalEvent(OnAttackAttempt); SubscribeLocalEvent(OnDropAttempt); @@ -80,6 +82,11 @@ namespace Content.Shared.MobState.EntitySystems CheckAct(uid, component, args); } + private void OnEmoteAttempt(EntityUid uid, MobStateComponent component, EmoteAttemptEvent args) + { + CheckAct(uid, component, args); + } + private void OnUnequipAttempt(EntityUid uid, MobStateComponent component, UnequipAttemptEvent args) { CheckAct(uid, component, args);