gated

Content.Server/RoundEnd/RoundEndSystem.cs

@@ -10,6 +10,7 @@ using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
+using Content.Shared._DV.CCVars; // DeltaV - round end is an OOC vote
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.GameTicking;
@@ -383,7 +384,12 @@ namespace Content.Server.RoundEnd
             {
                 if (!_shuttle.EmergencyShuttleArrived && ExpectedCountdownEnd is null)
                 {
-                    CallEvacuationVote(); // DeltaV - players vote on ending the round
+                    // Begin DeltaV - players vote on ending the round
+                    if (_cfg.GetCVar(DCCVars.RoundEndIsOOCVote))
+                        CallEvacuationVote();
+                    else
+                        RequestRoundEnd(checkCooldown: false, text: "round-end-system-shuttle-auto-called-announcement");
+                    // End DeltaV
                     _autoCalledBefore = true;
                 }
 

Content.Shared/_DV/CCVars/DCCVars.cs

@@ -331,4 +331,10 @@ public sealed partial class DCCVars
     /// </summary>
     public static readonly CVarDef<float> SsdIndicatorRecentAfterSeconds =
         CVarDef.Create("deltav.ssd.recent_after_seconds", 300f, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    /// Whether the round end is an OOC vote.
+    /// </summary>
+    public static readonly CVarDef<bool> RoundEndIsOOCVote =
+        CVarDef.Create("deltav.round_end_is_ooc_vote", false, CVar.SERVER);
 }

Resources/ConfigPresets/DeltaV/deltav.toml

@@ -112,3 +112,6 @@ max_announcement_length = 512
 [audio]
 attenuation = 4 # inversedistanceclamped 1 << 2, see audioparams.cs
 z_offset = -2
+
+[deltav]
+round_end_is_ooc_vote = true