Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Automatically start map and preset votes after round end (#78)" #64

Merged
merged 1 commit into from
Aug 27, 2024
+1 −6
Merged

Revert "Automatically start map and preset votes after round end (#78)" #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Content.Server/GameTicking/GameTicker.RoundFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
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;
Expand All @@ -29,7 +27,6 @@ public sealed partial class GameTicker
{
[Dependency] private readonly DiscordWebhook _discord = default!;
[Dependency] private readonly ITaskManager _taskManager = default!;
[Dependency] private readonly IVoteManager _vote = default!;

private static readonly Counter RoundNumberMetric = Metrics.CreateCounter(
"ss14_round_number",
Expand Down Expand Up @@ -296,7 +293,7 @@ public void StartRound(bool force = false)
AnnounceRound();
UpdateInfoText();
SendRoundStartedDiscordMessage();
RaiseLocalEvent(new RoundStartedEvent(RoundId)); // Corvax
RaiseLocalEvent(new RoundStartedEvent(RoundId)); // Stories

#if EXCEPTION_TOLERANCE
}
Expand Down Expand Up @@ -520,8 +517,6 @@ public void RestartRound()
UpdateInfoText();

ReqWindowAttentionAll();
_vote.CreateStandardVote(null, StandardVoteType.Map); // Stories-AutoVote
_vote.CreateStandardVote(null, StandardVoteType.Preset); // Stories-AutoVote
}
}

Expand Down
Loading