Revert "Add auto map vote cvar" (#27869)

Revert "Add auto map vote cvar (#27496)"

This reverts commit fe35188e2c7b3f7cf209aebf7f97c184e30ae8fb.

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index d01838964a4bd4f9ce2f024547ac8f8df29e13fe..df597e69b2fa5b26c609905db35e7759451e84f4 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -4,14 +4,12 @@ using Content.Server.Discord;
 using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Maps;
-using Content.Server.Voting.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
-using Content.Shared.Voting;
 using JetBrains.Annotations;
 using Prometheus;
 using Robust.Server.Maps;
@@ -29,7 +27,6 @@ namespace Content.Server.GameTicking
     {
         [Dependency] private readonly DiscordWebhook _discord = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
-        [Dependency] private readonly IVoteManager _voteManager = default!;
 
         private static readonly Counter RoundNumberMetric = Metrics.CreateCounter(
             "ss14_round_number",
@@ -511,11 +508,6 @@ namespace Content.Server.GameTicking
                 SendStatusToAll();
                 UpdateInfoText();
 
-                if (_configurationManager.GetCVar(CCVars.GameAutoMapVote))
-                {
-                    _voteManager.CreateStandardVote(null, StandardVoteType.Map);
-                }
-
                 ReqWindowAttentionAll();
             }
         }

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index c46f5fb923d8d0c37ec1a310078daa1a8b975a6e..36de8857fb146347d3b9a55acc000463b50bbf0b 100644 (file)
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -330,12 +330,6 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
-        /// <summary>
-        ///     Controls if lobby has an automatic map vote.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameAutoMapVote = CVarDef.Create("game.lobby_auto_map_vote", true, CVar.ARCHIVE | CVar.SERVERONLY);
-
 #if EXCEPTION_TOLERANCE
         /// <summary>
         ///     Amount of times round start must fail before the server is shut down.

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index a30313665e9c33f7a776c089dc03a9d60314da6f..413de472bf9e4f6ec67cbc84663cfb81fa707178 100644 (file)
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -4,7 +4,6 @@
 [game]
 desc             = "Official English Space Station 14 servers. Vanilla, low roleplay."
 lobbyenabled     = true
-lobby_auto_map_vote = false
 soft_max_players = 80
 panic_bunker.enabled = true
 panic_bunker.disable_with_admins = true