Role time tracking support for admins (#31776)

role time tracking support for admined players

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index f218de1c779d9f66a9c64e8ac8f03f7d6764a19c..7d5f177a2349c018e3ae6492c15bb0e1811dfd47 100644 (file)
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -76,7 +76,9 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         {
             trackers.Add(PlayTimeTrackingShared.TrackerAdmin);
             trackers.Add(PlayTimeTrackingShared.TrackerOverall);
-            return;
+
+            if (!_cfg.GetCVar(CCVars.GameAdminJobTracking))
+                return;
         }
 
         if (!IsPlayerAlive(player))

diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
index 7f26106ff16faf1f5c388b49986eef7f2bbe7bed..8f592499edbc18d5513ef22115c472c108b5c13b 100644 (file)
--- a/Content.Shared/CCVar/CCVars.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -195,4 +195,10 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<bool> AdminAllowMultiServerPlay =
         CVarDef.Create("admin.allow_multi_server_play", true, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Whether admins should gain role playtime even when playing while not de-adminned.
+    /// </summary>
+    public static readonly CVarDef<bool> GameAdminJobTracking =
+        CVarDef.Create("game.admin_job_tracking", false, CVar.SERVERONLY);
 }

diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
index f10b685322a9f288c79a17f7077d97bdc8062325..4f60c0a57de099a09edd60ac62585ddf5b81f7c1 100644 (file)
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -4,6 +4,7 @@ lobbyenabled = false
 # Dev map for faster loading & convenience
 map = "Dev"
 role_timers = false
+admin_job_tracking = true
 role_loadout_timers = false
 
 [events]