From 0e18d54cf731f99b5341bbc78aed14252bd399e9 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Wed, 3 Jan 2024 03:32:38 -0500
Subject: [PATCH] head revolutionaries are now blue (#23432)

* inital2

* raemove break
---
 .../Rules/RevolutionaryRuleSystem.cs          | 25 ++++++++++++-------
 .../game-presets/preset-revolutionary.ftl     |  9 +++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 2759e93118..d8d3177267 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -7,7 +7,6 @@ using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
-using Content.Server.Objectives;
 using Content.Server.Popups;
 using Content.Server.Revolutionary.Components;
 using Content.Server.Roles;
@@ -43,7 +42,6 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
-    [Dependency] private readonly ObjectivesSystem _objectives = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
@@ -104,15 +102,24 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
             ev.AddLine(Loc.GetString(Outcomes[index]));
 
             ev.AddLine(Loc.GetString("rev-headrev-count", ("initialCount", headrev.HeadRevs.Count)));
-            foreach (var player in headrev.HeadRevs.Values)
+            foreach (var player in headrev.HeadRevs)
             {
-                var title = _objectives.GetTitle(player);
-                if (title == null)
-                    continue;
-
                 // TODO: when role entities are a thing this has to change
-                var count = CompOrNull<RevolutionaryRoleComponent>(player)?.ConvertedCount ?? 0;
-                ev.AddLine(Loc.GetString("rev-headrev-player", ("title", title), ("count", count)));
+                var count = CompOrNull<RevolutionaryRoleComponent>(player.Value)?.ConvertedCount ?? 0;
+
+                _mind.TryGetSession(player.Value, out var session);
+                var username = session?.Name;
+                if (username != null)
+                {
+                    ev.AddLine(Loc.GetString("rev-headrev-name-user",
+                    ("name", player.Key),
+                    ("username", username), ("count", count)));
+                }
+                else
+                {
+                    ev.AddLine(Loc.GetString("rev-headrev-name",
+                    ("name", player.Key), ("count", count)));
+                }
 
                 // TODO: someone suggested listing all alive? revs maybe implement at some point
             }
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 ba2e3e554a..4ace8f96d2 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
@@ -55,7 +55,12 @@ rev-headrev-count = {$initialCount ->
     *[other] There were {$initialCount} Head Revolutionaries:
 }
 
-rev-headrev-player = {$title} converted {$count} {$count ->
+rev-headrev-name-user = [color=#5e9cff]{$name}[/color] ([color=gray]{$username}[/color]) converted {$count} {$count ->
     [one] person
     *[other] people
-}.
+}
+
+rev-headrev-name = [color=#5e9cff]{$name}[/color] converted {$count} {$count ->
+    [one] person
+    *[other] people
+}