New CVAR and removal of unintended debug code.

rbertoche · Dec 8, 2023 · 2e60e09 · 2e60e09
1 parent eff01ae
commit 2e60e09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -537,8 +537,7 @@ public override void Update(float frameTime)
             {
                 ForceUpdate();
                 _cfg.SetCVar(CCVars.NightTime, true);
-                Console.WriteLine("Noite! Atualize as lampadas.");
-                if (_isStationDefined)
+                if (_isStationDefined && _cfg.GetCVar(CCVars.ShiftAnnouncement))
                 {
                     _chatSystem.DispatchStationAnnouncement(
                         _originStation.GetValueOrDefault(), Loc.GetString("time-cycle-night"), "Central de Comando", true, nightShift, colorOverride: Color.SkyBlue);
@@ -548,7 +547,7 @@ public override void Update(float frameTime)
             {
                 ForceUpdate();
                 _cfg.SetCVar(CCVars.NightTime, false);
-                if (_isStationDefined)
+                if (_isStationDefined && _cfg.GetCVar(CCVars.ShiftAnnouncement))
                 {
                     _chatSystem.DispatchStationAnnouncement(
                         _originStation.GetValueOrDefault(), Loc.GetString("time-cycle-day"), "Central de Comando", true, dayShift, colorOverride: Color.Orange);

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -1830,6 +1830,8 @@ public static readonly CVarDef<float>
             CVarDef.Create("time.night_time", false, desc: "Não altere.", flag: CVar.SERVERONLY);
         public static readonly CVarDef<bool> DayNightCycle =
             CVarDef.Create("time.day_night_cycle", true, desc: "Define se o sistema de iluminação noturna estará ativado na estação. (true/false)", flag: CVar.SERVERONLY);
+        public static readonly CVarDef<bool> ShiftAnnouncement =
+            CVarDef.Create("time.shift_announcement", true, desc: "Define se serão emitidos anúncios após a mudança de turno. (true/false)", flag: CVar.SERVERONLY);
         public static readonly CVarDef<float> LightIntensityFall =
             CVarDef.Create("time.light_intensity_fall", 1.75f, desc: "Define o multiplicador queda de intensidade das luzes durante o modo noturno. (fator)", flag: CVar.SERVERONLY);
         public static readonly CVarDef<int> NightChangeTime =