From 5f0b665f0e2051c7a6edc6555ba3231fb8589559 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 4 Oct 2023 22:22:30 -0700
Subject: [PATCH] Fix printing $username at round end for head revs when it
 doesn't have a session (#20742)

---
 .../Rules/RevolutionaryRuleSystem.cs          | 32 +++++++++----------
 .../game-presets/preset-revolutionary.ftl     |  3 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 7efd3a9ce3..17d9912f4b 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -1,30 +1,30 @@
 using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Antag;
 using Content.Server.Chat.Managers;
+using Content.Server.Flash;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
+using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
+using Content.Server.Popups;
+using Content.Server.Revolutionary.Components;
 using Content.Server.Roles;
+using Content.Server.RoundEnd;
+using Content.Shared.Chat;
+using Content.Shared.Database;
 using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Mind;
+using Content.Shared.Mindshield.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Revolutionary.Components;
 using Content.Shared.Roles;
 using Content.Shared.Stunnable;
-using Robust.Shared.Timing;
-using Content.Server.Popups;
-using Content.Server.Revolutionary.Components;
-using Content.Shared.IdentityManagement;
-using Content.Server.Flash;
-using Content.Shared.Mindshield.Components;
-using Content.Server.Administration.Logs;
-using Content.Shared.Database;
-using Content.Server.Antag;
-using Content.Server.NPC.Components;
-using Content.Server.RoundEnd;
-using Content.Shared.Chat;
-using Content.Shared.Mind;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Zombies;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -104,13 +104,13 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
                 var username = session?.Name;
                 if (username != null)
                 {
-                    ev.AddLine(Loc.GetString("head-rev-initial",
+                    ev.AddLine(Loc.GetString("head-rev-initial-name-user",
                     ("name", player.Key),
                     ("username", username)));
                 }
                 else
                 {
-                    ev.AddLine(Loc.GetString("head-rev-initial",
+                    ev.AddLine(Loc.GetString("head-rev-initial-name",
                     ("name", player.Key)));
                 }
             }
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl
index 53aea2a20b..2ef3e11ee8 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl
@@ -10,7 +10,8 @@ head-rev-role-greeting =
     Beware, this won't work on Security, Command, or those wearing sunglasses.
     Viva la revolución!
 
-head-rev-initial = [color=#5e9cff]{$name}[/color] ([color=gray]{$username}[/color]) was one of the Head Revolutionaries.
+head-rev-initial-name = [color=#5e9cff]{$name}[/color] was one of the Head Revolutionaries.
+head-rev-initial-name-user = [color=#5e9cff]{$name}[/color] ([color=gray]{$username}[/color]) was one of the Head Revolutionaries.
 
 head-rev-initial-count = {$initialCount ->
     [one] There was one Head Revolutionary:
-- 
2.51.2