From 085c863c95e9588933f76d5500a883f9f40534e3 Mon Sep 17 00:00:00 2001
From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com>
Date: Fri, 5 Jul 2024 20:43:49 +0300
Subject: [PATCH 1/2] fix: fix discord round ended message (#422)

---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index c3a09b8796..d5875cd0c7 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -453,8 +453,6 @@ namespace Content.Server.GameTicking
 
             _replayRoundPlayerInfo = listOfPlayerInfoFinal;
             _replayRoundText = roundEndText;
-
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration)); // WD-EDIT
         }
 
         private async void SendRoundEndDiscordMessage()
@@ -505,7 +503,9 @@ namespace Content.Server.GameTicking
             _sawmill.Info("Restarting round!");
 
             SendServerMessage(Loc.GetString("game-ticker-restart-round"));
-            RaiseLocalEvent(new RealRoundEndedEvent());
+
+            RaiseLocalEvent(new RealRoundEndedEvent()); // WD
+            RaiseLocalEvent(new RoundEndedEvent(RoundId, RoundDuration())); // WD
 
             RoundNumberMetric.Inc();
 

From 2cfe6b34c9907d878ab586036fdca3fa90844ac3 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Fri, 5 Jul 2024 18:00:41 +0000
Subject: [PATCH 2/2] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index e73eaf7f23..687c6aca32 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -5500,3 +5500,13 @@
   id: 355
   time: '2024-07-05T15:01:37.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/418
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u0438\u0441\u043A\u043E\u0440\u0434-\u0441\u043E\u043E\u0431\u0449\
+      \u0435\u043D\u0438\u0435 \u043E \u043A\u043E\u043D\u0446\u0435 \u0440\u0430\u0443\
+      \u043D\u0434\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438\u0445\
+      \u043E\u0434\u0438\u0442."
+    type: Fix
+  id: 356
+  time: '2024-07-05T17:43:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/422