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

This commit is contained in:
Rane
2022-04-08 17:17:05 -04:00
committed by GitHub
parent 6e91538baf
commit 427f7378c3
7 changed files with 22 additions and 26 deletions

View File

@@ -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);
}
}
}

View File

@@ -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)