From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Tue, 2 Jan 2024 06:19:41 +0000 (-0500)
Subject: Fix all objectives on end screen being bolded (#23345)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=719b44f1ce9285b21cfe71c3e139279c28ec45cb;p=space-station-14.git

Fix all objectives on end screen being bolded (#23345)

fix all objectives on end screen being bolded.
---

diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index f59066ff99..b18668247a 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -116,10 +116,10 @@ public sealed class ObjectivesSystem : SharedObjectivesSystem
 
             result += "\n";
 
-            var custody = IsInCustody(mindId, mind) ? Loc.GetString("objectives-in-custody") + " " : "";
+            var custody = IsInCustody(mindId, mind) ? Loc.GetString("objectives-in-custody") : string.Empty;
 
-            var objectives = mind.AllObjectives.ToArray();
-            if (objectives.Length == 0)
+            var objectives = mind.Objectives;
+            if (objectives.Count == 0)
             {
                 result += Loc.GetString("objectives-no-objectives", ("custody", custody), ("title", title), ("agent", agent));
                 continue;
diff --git a/Resources/Locale/en-US/objectives/round-end.ftl b/Resources/Locale/en-US/objectives/round-end.ftl
index 129d809823..b4314b2caf 100644
--- a/Resources/Locale/en-US/objectives/round-end.ftl
+++ b/Resources/Locale/en-US/objectives/round-end.ftl
@@ -9,10 +9,10 @@ objectives-player-user-named = [color=White]{$name}[/color] ([color=gray]{$user}
 objectives-player-user = [color=gray]{$user}[/color]
 objectives-player-named = [color=White]{$name}[/color]
 
-objectives-no-objectives = [bold][color=red]{$custody}[/color]{$title} was a {$agent}.
-objectives-with-objectives = [bold][color=red]{$custody}[/color]{$title} was a {$agent} who had the following objectives:
+objectives-no-objectives = {$custody}{$title} was a {$agent}.
+objectives-with-objectives = {$custody}{$title} was a {$agent} who had the following objectives:
 
 objectives-objective-success = {$objective} | [color={$markupColor}]Success![/color]
 objectives-objective-fail = {$objective} | [color={$markupColor}]Failure![/color] ({$progress}%)
 
-objectives-in-custody = | IN CUSTODY |
\ No newline at end of file
+objectives-in-custody = [bold][color=red]| IN CUSTODY | [/color][/bold]