From 04bda3ad5912ef25af1b3878dda1c86704a0d8cd Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Tue, 13 Jan 2026 11:22:04 +0100 Subject: [PATCH] Role time tracking support for admins (#31776) role time tracking support for admined players Co-authored-by: Milon Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --- .../Players/PlayTimeTracking/PlayTimeTrackingSystem.cs | 4 +++- Content.Shared/CCVar/CCVars.Admin.cs | 6 ++++++ Resources/ConfigPresets/Build/development.toml | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index f218de1c77..7d5f177a23 100644 --- 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 7f26106ff1..8f592499ed 100644 --- a/Content.Shared/CCVar/CCVars.Admin.cs +++ b/Content.Shared/CCVar/CCVars.Admin.cs @@ -195,4 +195,10 @@ public sealed partial class CCVars /// public static readonly CVarDef AdminAllowMultiServerPlay = CVarDef.Create("admin.allow_multi_server_play", true, CVar.SERVERONLY); + + /// + /// Whether admins should gain role playtime even when playing while not de-adminned. + /// + public static readonly CVarDef 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 f10b685322..4f60c0a57d 100644 --- 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] -- 2.52.0