Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Stop mimes from screaming or laughing (#16052)

Browse Source
This commit is contained in:
themias
2023-05-03 13:24:00 -04:00
committed by GitHub
parent fa03425e56
commit c3f4f0b132
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Abilities/Mime/MimePowersSystem.cs
View File

@@ -11,6 +11,10 @@ using Robust.Shared.Player;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Content.Server.Chat.Systems;
using Content.Server.Speech.Components;
using Content.Shared.Chat.Prototypes;
using Content.Server.Speech.EntitySystems;
namespace Content.Server.Abilities.Mime namespace Content.Server.Abilities.Mime
{ {
@@ -28,6 +32,8 @@ namespace Content.Server.Abilities.Mime
SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit); SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
SubscribeLocalEvent<MimePowersComponent, SpeakAttemptEvent>(OnSpeakAttempt); SubscribeLocalEvent<MimePowersComponent, SpeakAttemptEvent>(OnSpeakAttempt);
SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall); SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
SubscribeLocalEvent<MimePowersComponent, EmoteEvent>(OnEmote, before: new[] { typeof(VocalSystem) });
SubscribeLocalEvent<MimePowersComponent, ScreamActionEvent>(OnScreamAction, before: new[] { typeof(VocalSystem) });
} }
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
@@ -60,6 +66,25 @@ namespace Content.Server.Abilities.Mime
args.Cancel(); args.Cancel();
} }
private void OnEmote(EntityUid uid, MimePowersComponent component, ref EmoteEvent args)
{
if (!component.Enabled || args.Handled)
return;
//still leaves the text so it looks like they are pantomiming a laugh
if (args.Emote.Category.HasFlag(EmoteCategory.Vocal))
args.Handled = true;
}
private void OnScreamAction(EntityUid uid, MimePowersComponent component, ScreamActionEvent args)
{
if (!component.Enabled || args.Handled)
return;
_popupSystem.PopupEntity(Loc.GetString("mime-cant-speak"), uid, uid);
args.Handled = true;
}
/// <summary> /// <summary>
/// Creates an invisible wall in a free space after some checks. /// Creates an invisible wall in a free space after some checks.
/// </summary> /// </summary>