don't add the scream action

Simple-Station · Mar 10, 2024 · 6403503 · 6403503
1 parent 4bb19f0
commit 6403503
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 1 deletion.
diff --git a/Content.Server/Speech/Components/VocalComponent.cs b/Content.Server/Speech/Components/VocalComponent.cs
@@ -31,6 +31,12 @@ public sealed partial class VocalComponent : Component
     [DataField("wilhelmProbability")]
     public float WilhelmProbability = 0.0002f;
 
+    [DataField("screamAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string ScreamAction = "ActionScream";
+
+    [DataField("screamActionEntity")]
+    public EntityUid? ScreamActionEntity;
+
     /// <summary>
     ///     Currently loaded emote sounds prototype, based on entity sex.
     ///     Null if no valid prototype for entity sex was found.

diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
@@ -24,15 +24,28 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<VocalComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<VocalComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<VocalComponent, SexChangedEvent>(OnSexChanged);
         SubscribeLocalEvent<VocalComponent, EmoteEvent>(OnEmote);
+        SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnScreamAction);
     }
 
     private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
     {
+        // try to add scream action when vocal comp added
+        // _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction); // Parkstation-RemoveScreamAction
         LoadSounds(uid, component);
     }
 
+    private void OnShutdown(EntityUid uid, VocalComponent component, ComponentShutdown args)
+    {
+        // remove scream action when component removed
+        if (component.ScreamActionEntity != null)
+        {
+            _actions.RemoveAction(uid, component.ScreamActionEntity);
+        }
+    }
+
     private void OnSexChanged(EntityUid uid, VocalComponent component, SexChangedEvent args)
     {
         LoadSounds(uid, component);
@@ -54,6 +67,15 @@ private void OnEmote(EntityUid uid, VocalComponent component, ref EmoteEvent arg
         args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote);
     }
 
+    private void OnScreamAction(EntityUid uid, VocalComponent component, ScreamActionEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        _chat.TryEmoteWithChat(uid, component.ScreamId);
+        args.Handled = true;
+    }
+
     private bool TryPlayScreamSound(EntityUid uid, VocalComponent component)
     {
         if (_random.Prob(component.WilhelmProbability))

diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -17,6 +17,7 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<MutedComponent, SpeakAttemptEvent>(OnSpeakAttempt);
             SubscribeLocalEvent<MutedComponent, EmoteEvent>(OnEmote, before: new[] { typeof(VocalSystem) });
+            SubscribeLocalEvent<MutedComponent, ScreamActionEvent>(OnScreamAction, before: new[] { typeof(VocalSystem) });
         }
 
         private void OnEmote(EntityUid uid, MutedComponent component, ref EmoteEvent args)
@@ -29,6 +30,19 @@ private void OnEmote(EntityUid uid, MutedComponent component, ref EmoteEvent arg
                 args.Handled = true;
         }
 
+        private void OnScreamAction(EntityUid uid, MutedComponent component, ScreamActionEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (HasComp<MimePowersComponent>(uid))
+                _popupSystem.PopupEntity(Loc.GetString("mime-cant-speak"), uid, uid);
+
+            else
+                _popupSystem.PopupEntity(Loc.GetString("speech-muted"), uid, uid);
+            args.Handled = true;
+        }
+
 
         private void OnSpeakAttempt(EntityUid uid, MutedComponent component, SpeakAttemptEvent args)
         {

diff --git a/Content.Shared/Speech/ScreamActionEvent.cs b/Content.Shared/Speech/ScreamActionEvent.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Speech;
+
+public sealed partial class ScreamActionEvent : InstantActionEvent
+{
+}
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
@@ -1,3 +1,15 @@
+- type: entity
+  id: ActionScream
+  name: Scream
+  description: AAAAAAAAAAAAAAAAAAAAAAAAA
+  noSpawn: true
+  components:
+  - type: InstantAction
+    useDelay: 10
+    icon: Interface/Actions/scream.png
+    event: !type:ScreamActionEvent
+    checkCanInteract: false
+
 - type: entity
   id: ActionTurnUndead
   name: Turn Undead

diff --git a/Resources/Prototypes/Catalog/catalog.yml b/Resources/Prototypes/Catalog/catalog.yml
@@ -28,7 +28,7 @@
   id: DebugListing4
   name: debug name 4
   description: debug desc 4
-  productAction: ActionSleep
+  productAction: ActionScream
   categories:
     - Debug
   cost: