diff --git a/Content.Server/Administration/BwoinkSystem.cs b/Content.Server/Administration/BwoinkSystem.cs index 0489bb123a..30807ca448 100644 --- a/Content.Server/Administration/BwoinkSystem.cs +++ b/Content.Server/Administration/BwoinkSystem.cs @@ -22,6 +22,8 @@ using Robust.Shared.Log; using Robust.Shared.Network; using Robust.Shared.Utility; using System.Text.Json.Serialization; +using Content.Server.GameTicking.Events; +using Content.Server.GameTicking; namespace Content.Server.Administration { @@ -32,6 +34,7 @@ namespace Content.Server.Administration [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IConfigurationManager _config = default!; [Dependency] private readonly IPlayerLocator _playerLocator = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; private ISawmill _sawmill = default!; private readonly HttpClient _httpClient = new(); @@ -50,6 +53,13 @@ namespace Content.Server.Administration _config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true); _sawmill = IoCManager.Resolve().GetSawmill("AHELP"); _maxAdditionalChars = GenerateAHelpMessage("", "", true, true).Length + Header("").Length; + + SubscribeLocalEvent(RoundStarting); + } + + private void RoundStarting(RoundStartingEvent ev) + { + _relayMessages.Clear(); } private void OnServerNameChanged(string obj) @@ -94,7 +104,7 @@ namespace Content.Server.Administration var payload = new WebhookPayload() { - Username = oldMessage.username, + Username = $"R:{_gameTicker.RoundId}|N:{oldMessage.username}", Content = oldMessage.content };