From e4ccd1e7e9d16e36966184c2f2b623be90bf2840 Mon Sep 17 00:00:00 2001
From: Vanessa <vanessalouwagie@gmail.com>
Date: Wed, 19 Nov 2025 21:51:19 -0600
Subject: [PATCH] Fixed DeltaV objectives with PickRandomHead.

---
 .../_DV/objectives/conditions/roboneuroticist.ftl |  2 +-
 Resources/Prototypes/_DV/Objectives/ninja.yml     | 15 +++++++++++++--
 .../Prototypes/_DV/Objectives/roboneuroticist.yml |  7 ++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Resources/Locale/en-US/_DV/objectives/conditions/roboneuroticist.ftl b/Resources/Locale/en-US/_DV/objectives/conditions/roboneuroticist.ftl
index 8c7068d431..1f0d371491 100644
--- a/Resources/Locale/en-US/_DV/objectives/conditions/roboneuroticist.ftl
+++ b/Resources/Locale/en-US/_DV/objectives/conditions/roboneuroticist.ftl
@@ -1 +1 @@
-objective-roboneuroticist-kill-title = Condemn them to metal
+objective-roboneuroticist-kill-title = Condemn {$targetName}, {CAPITALIZE($job)} to metal
diff --git a/Resources/Prototypes/_DV/Objectives/ninja.yml b/Resources/Prototypes/_DV/Objectives/ninja.yml
index 3f659ae280..a35fcc8737 100644
--- a/Resources/Prototypes/_DV/Objectives/ninja.yml
+++ b/Resources/Prototypes/_DV/Objectives/ninja.yml
@@ -18,7 +18,12 @@
   parent: BaseNinjaTeachLessonObjective
   id: NinjaTeachLessonRandomHeadObjective
   components:
-  - type: PickRandomHead
+  - type: PickRandomPerson
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
 
 - type: entity
   parent: BaseNinjaTeachLessonObjective
@@ -37,7 +42,13 @@
       state: icon
   - type: TargetObjective
     title: objective-ninja-kill-head-title
-  - type: PickRandomHead
+  - type: PickRandomPerson
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
+
   - type: KillPersonCondition
     requireDead: true
 
diff --git a/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml b/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml
index 5c184de236..98efd929ab 100644
--- a/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml
+++ b/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml
@@ -44,7 +44,12 @@
       state: icon
   - type: TargetObjective
     title: objective-roboneuroticist-kill-title
-  - type: PickRandomHead
+  - type: PickRandomPerson
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
   - type: KillPersonCondition
     requireDead: true