From 69e69e7db71c835b53892b172334b261f5477426 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 8 Aug 2022 04:55:50 -0400
Subject: [PATCH] Captain's Captain's Jetpack (#10195)

---
 Content.Server/Objectives/Conditions/StealCondition.cs     | 7 +++++--
 .../Locale/en-US/objectives/conditions/steal-condition.ftl | 1 +
 Resources/Prototypes/Objectives/traitorObjectives.yml      | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs
index a5ac6160c5..15e02fa15b 100644
--- a/Content.Server/Objectives/Conditions/StealCondition.cs
+++ b/Content.Server/Objectives/Conditions/StealCondition.cs
@@ -21,7 +21,7 @@ namespace Content.Server.Objectives.Conditions
         /// instead of "steal advanced magboots. Should be a loc string.
         /// </summary>
         [ViewVariables]
-        [DataField("owner", required: true)] private string _owner = string.Empty;
+        [DataField("owner")] private string? _owner = null;
 
         public IObjectiveCondition GetAssigned(Mind.Mind mind)
         {
@@ -38,7 +38,10 @@ namespace Content.Server.Objectives.Conditions
                 ? prototype.Name
                 : "[CANNOT FIND NAME]";
 
-        public string Title => Loc.GetString("objective-condition-steal-title", ("owner", Loc.GetString(_owner)), ("itemName", Loc.GetString(PrototypeName)));
+        public string Title =>
+            _owner == null
+                ? Loc.GetString("objective-condition-steal-title-no-owner", ("owner", ("itemName", Loc.GetString(PrototypeName))))
+                : Loc.GetString("objective-condition-steal-title", ("owner", Loc.GetString(_owner)), ("itemName", Loc.GetString(PrototypeName)));
 
         public string Description => Loc.GetString("objective-condition-steal-description",("itemName", Loc.GetString(PrototypeName)));
 
diff --git a/Resources/Locale/en-US/objectives/conditions/steal-condition.ftl b/Resources/Locale/en-US/objectives/conditions/steal-condition.ftl
index 79cdbc2168..35095c2a2d 100644
--- a/Resources/Locale/en-US/objectives/conditions/steal-condition.ftl
+++ b/Resources/Locale/en-US/objectives/conditions/steal-condition.ftl
@@ -1,3 +1,4 @@
+objective-condition-steal-title-no-owner = Steal the {$itemName}.
 objective-condition-steal-title = Steal the {$owner}'s {$itemName}.
 objective-condition-steal-description = We need you to steal {$itemName}. Don't get caught.
 
diff --git a/Resources/Prototypes/Objectives/traitorObjectives.yml b/Resources/Prototypes/Objectives/traitorObjectives.yml
index a3bc28971e..1c09bae827 100644
--- a/Resources/Prototypes/Objectives/traitorObjectives.yml
+++ b/Resources/Prototypes/Objectives/traitorObjectives.yml
@@ -11,7 +11,6 @@
   conditions:
     - !type:StealCondition
       prototype: CaptainIDCard
-      owner: job-name-captain
 
 - type: objective
   id: KillRandomObjective
@@ -191,4 +190,3 @@
   conditions:
     - !type:StealCondition
       prototype: JetpackCaptainFilled
-      owner: job-name-captain