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

Prevent emoting while dead

Browse Source 
Fixes 4992
This commit is contained in:
metalgearsloth
2021-10-24 17:16:47 +11:00
parent a4cd222bea
commit f07104d45b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/MobState/EntitySystems/MobStateSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.DragDrop; using Content.Shared.DragDrop;
using Content.Shared.Emoting;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Inventory.Events; using Content.Shared.Inventory.Events;
using Content.Shared.Item; using Content.Shared.Item;
@@ -26,6 +27,7 @@ namespace Content.Shared.MobState.EntitySystems
SubscribeLocalEvent<MobStateComponent, ThrowAttemptEvent>(OnThrowAttempt); SubscribeLocalEvent<MobStateComponent, ThrowAttemptEvent>(OnThrowAttempt);
SubscribeLocalEvent<MobStateComponent, SpeakAttemptEvent>(OnSpeakAttempt); SubscribeLocalEvent<MobStateComponent, SpeakAttemptEvent>(OnSpeakAttempt);
SubscribeLocalEvent<MobStateComponent, EquipAttemptEvent>(OnEquipAttempt); SubscribeLocalEvent<MobStateComponent, EquipAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<MobStateComponent, EmoteAttemptEvent>(OnEmoteAttempt);
SubscribeLocalEvent<MobStateComponent, UnequipAttemptEvent>(OnUnequipAttempt); SubscribeLocalEvent<MobStateComponent, UnequipAttemptEvent>(OnUnequipAttempt);
SubscribeLocalEvent<MobStateComponent, AttackAttemptEvent>(OnAttackAttempt); SubscribeLocalEvent<MobStateComponent, AttackAttemptEvent>(OnAttackAttempt);
SubscribeLocalEvent<MobStateComponent, DropAttemptEvent>(OnDropAttempt); SubscribeLocalEvent<MobStateComponent, DropAttemptEvent>(OnDropAttempt);
@@ -80,6 +82,11 @@ namespace Content.Shared.MobState.EntitySystems
CheckAct(uid, component, args); 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) private void OnUnequipAttempt(EntityUid uid, MobStateComponent component, UnequipAttemptEvent args)
{ {
CheckAct(uid, component, args); CheckAct(uid, component, args);