]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Stop mimes from screaming or laughing (#16052)
authorthemias <89101928+themias@users.noreply.github.com>
Wed, 3 May 2023 17:24:00 +0000 (13:24 -0400)
committerGitHub <noreply@github.com>
Wed, 3 May 2023 17:24:00 +0000 (10:24 -0700)
Content.Server/Abilities/Mime/MimePowersSystem.cs

index 6bec9c908abc03dfe106cf00c5004b08162eb158..9adc91610d99837e857020a77417986d6d59dd60 100644 (file)
@@ -11,6 +11,10 @@ using Robust.Shared.Player;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 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
 {
@@ -28,6 +32,8 @@ namespace Content.Server.Abilities.Mime
             SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
             SubscribeLocalEvent<MimePowersComponent, SpeakAttemptEvent>(OnSpeakAttempt);
             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)
         {
@@ -60,6 +66,25 @@ namespace Content.Server.Abilities.Mime
             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>
         /// Creates an invisible wall in a free space after some checks.
         /// </summary>