Admin New Player Notification Sound (#200)

# Description Adds a quick ping sound that plays to every active (not de-adminned) admin whenever a new player joins.
Simple-Station · Aug 31, 2023 · a0c76bf · a0c76bf
1 parent d3dea41
commit a0c76bf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
@@ -308,7 +308,7 @@ private async void LoginAdminMaybe(IPlayerSession session)
 
             _admins.Add(session, reg);
 
-            if (!session.ContentData()!.ExplicitlyDeadminned)
+            if (session.ContentData() != null && !session.ContentData()!.ExplicitlyDeadminned) // Parkstation-NewPlayerPing: Server crashes if player is not in the database
             {
                 reg.Data.Active = true;
 

diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -4,9 +4,13 @@
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using Content.Shared.Preferences;
+using Content.Shared.SimpleStation14.CCVar;
 using JetBrains.Annotations;
 using Robust.Server.Player;
+using Robust.Shared.Audio;
 using Robust.Shared.Enums;
+using Robust.Shared.Player;
+using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using PlayerData = Content.Server.Players.PlayerData;
@@ -19,6 +23,7 @@ public sealed partial class GameTicker
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly PlayTimeTrackingManager _playTimeTrackingManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
+        [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
 
         private void InitializePlayer()
         {
@@ -68,6 +73,11 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
                         ? Loc.GetString("player-first-join-message", ("name", args.Session.Name))
                         : Loc.GetString("player-join-message", ("name", args.Session.Name)));
 
+                    if (firstConnection && _configurationManager.GetCVar(SimpleStationCCVars.AdminNewPlayerJoinSound))
+                        _audioSystem.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
+                            Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
+                            audioParams: new AudioParams { Volume = -5f });
+
                     if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
                     {
                         _roundStartCountdownHasNotStartedYetDueToNoPlayers = false;

diff --git a/Content.Shared/SimpleStation14/CCVar/CCVars.cs b/Content.Shared/SimpleStation14/CCVar/CCVars.cs
@@ -5,6 +5,15 @@ namespace Content.Shared.SimpleStation14.CCVar;
 [CVarDefs]
 public sealed class SimpleStationCCVars
 {
+    #region Admin
+    public static readonly CVarDef<bool> AdminNewPlayerJoinSound =
+        CVarDef.Create("admin.new_player_join_sound", false, CVar.SERVERONLY);
+    #endregion
+
+    /*
+     * Announcers
+     */
+    #region Announcers
     /// <summary>
     ///     Optionally force set an announcer
     /// </summary>
@@ -16,6 +25,7 @@ public sealed class SimpleStationCCVars
     /// </summary>
     public static readonly CVarDef<List<string>> AnnouncerBlacklist =
         CVarDef.Create("game.announcer.blacklist", new List<string>(), CVar.SERVERONLY);
+    #endregion
 
     /*
      * End of round stats

diff --git a/Resources/Audio/Effects/newplayerping.ogg b/Resources/Audio/Effects/newplayerping.ogg
diff --git a/Resources/ConfigPresets/SimpleStation14/Parkstation.toml b/Resources/ConfigPresets/SimpleStation14/Parkstation.toml
@@ -117,6 +117,9 @@ patreon = "https://www.patreon.com/simple14"
 [netres]
 limit = 0.0
 
+[admin]
+new_player_join_sound = true
+
 
 [build]
 fork_id = "ParkStation14"