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 f59066ff99f9a7491c6e2f0707fa37f9efc47c09..b18668247a4c4c4612540a7910e8970a964a1f0d 100644 (file)
--- 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 129d809823eb693690d01ec6c059dee548071f3e..b4314b2caff91dac583c9d3f1f77c8136f8c0d2c 100644 (file)
--- 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]