All computers play the keyboard sound + small research client cleanup (#7312)

Content.Client/Entry/IgnoredComponents.cs

@@ -23,6 +23,7 @@ namespace Content.Client.Entry
             "EmitSoundOnLand",
             "EmitSoundOnTrigger",
             "EmitSoundOnActivate",
+            "EmitSoundOnUIOpen",
             "NameIdentifier",
             "HeatResistance",
             "EntityStorage",

Content.Server/Research/Components/ResearchConsoleComponent.cs

@@ -17,9 +17,6 @@ namespace Content.Server.Research.Components
         [Dependency] private readonly IEntityManager _entMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        [DataField("sound")]
-        private SoundSpecifier _soundCollectionName = new SoundCollectionSpecifier("keyboard");
-
         [ViewVariables] private bool Powered => !_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
 
         [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ResearchConsoleUiKey.Key);
@@ -92,19 +89,5 @@ namespace Content.Server.Research.Components
 
             return new ResearchConsoleBoundInterfaceState(points, pointsPerSecond);
         }
-
-        /// <summary>
-        ///     Open the user interface on a certain player session.
-        /// </summary>
-        /// <param name="session">Session where the UI will be shown</param>
-        public void OpenUserInterface(IPlayerSession session)
-        {
-            UserInterface?.Open(session);
-        }
-
-        public void PlayKeyboardSound()
-        {
-            SoundSystem.Play(Filter.Pvs(Owner), _soundCollectionName.GetSound(), Owner, AudioParams.Default);
-        }
     }
 }

Content.Server/Research/ResearchSystem.cs

@@ -1,8 +1,6 @@
-using Content.Server.UserInterface;
 using Content.Server.Research.Components;
 using JetBrains.Annotations;
 
-
 namespace Content.Server.Research
 {
     [UsedImplicitly]
@@ -17,12 +15,6 @@ namespace Content.Server.Research
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<ResearchConsoleComponent, AfterActivatableUIOpenEvent>(OnAfterUIOpen);
-        }
-
-        private void OnAfterUIOpen(EntityUid uid, ResearchConsoleComponent component, AfterActivatableUIOpenEvent args)
-        {
-            component.PlayKeyboardSound();
         }
 
         public bool RegisterServer(ResearchServerComponent server)

Content.Server/Sound/Components/EmitSoundOnUIOpenComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Server.Sound.Components
+{
+    /// <summary>
+    /// Simple sound emitter that emits sound on AfterActivatableUIOpenEvent
+    /// </summary>
+    [RegisterComponent]
+    public sealed class EmitSoundOnUIOpenComponent : BaseEmitSoundComponent
+    {
+    }
+}

Content.Server/Sound/EmitSoundSystem.cs

@@ -2,6 +2,7 @@ using Content.Server.Explosion.EntitySystems;
 using Content.Server.Interaction.Components;
 using Content.Server.Sound.Components;
 using Content.Server.Throwing;
+using Content.Server.UserInterface;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Throwing;
@@ -29,6 +30,7 @@ namespace Content.Server.Sound
             SubscribeLocalEvent<EmitSoundOnThrowComponent, ThrownEvent>(HandleEmitSoundOnThrown);
             SubscribeLocalEvent<EmitSoundOnActivateComponent, ActivateInWorldEvent>(HandleEmitSoundOnActivateInWorld);
             SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
+            SubscribeLocalEvent<EmitSoundOnUIOpenComponent, AfterActivatableUIOpenEvent>(HandleEmitSoundOnUIOpen);
         }
 
         private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
@@ -64,6 +66,11 @@ namespace Content.Server.Sound
                 arg.Handled = true;
         }
 
+        private void HandleEmitSoundOnUIOpen(EntityUid eUI, BaseEmitSoundComponent component, AfterActivatableUIOpenEvent arg)
+        {
+            TryEmitSound(component);
+        }
+
         private void TryEmitSound(BaseEmitSoundComponent component)
         {
             var audioParams = component.AudioParams.WithPitchScale((float) _random.NextGaussian(1, component.PitchVariation));

Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml

@@ -41,3 +41,6 @@
     autoRot: true
     offset: "0, 0.4" # shine from the top, not bottom of the computer
     castShadows: false
+  - type: EmitSoundOnUIOpen
+    sound:
+      collection: Keyboard

Resources/Prototypes/SoundCollections/keyboard.yml

@@ -1,5 +1,5 @@
 - type: soundCollection
-  id: keyboard
+  id: Keyboard
   files:
   - /Audio/Machines/Keyboard/keyboard1.ogg
   - /Audio/Machines/Keyboard/keyboard2.ogg