Fixed component name. Whoops.

Resources/Prototypes/Entities/Objects/Misc/implanters.yml

@@ -313,7 +313,7 @@
 - type: entity
   id: RadioImplanterCentcomm
   name: centcomm radio implanter
-  parent: BaseImplantOnlyImplanter
+  parent: BaseImplantOnlyImplanterCentcomm # Goob CentComm Implanters
   components:
   - type: Implanter
     implant: RadioImplantCentcomm
@@ -321,7 +321,7 @@
 - type: entity
   id: DeathRattleImplanterCentcomm
   name: centcomm death rattle implanter
-  parent: BaseImplantOnlyImplanter
+  parent: BaseImplantOnlyImplanterCentcomm # Goob CentComm Implanters
   components:
   - type: Implanter
     implant: DeathRattleImplantCentcomm

Resources/Prototypes/Objectives/traitor.yml

@@ -96,6 +96,10 @@
     title: objective-condition-maroon-person-title
   - type: PickRandomPerson
     filters:
+    - !type:BodyMindFilter #  DeltaV - TargetObjectiveImmune
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:
@@ -122,6 +126,9 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist: # DeltaV - TargetObjectiveImmune
+        components:
+        - TargetObjectiveImmune
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:
@@ -150,6 +157,10 @@
       whitelist:
         components:
         - TraitorRole
+    - !type:BodyMindFilter # DeltaV - TargetObjectiveImmune
+      blacklist:
+        components:
+        - TargetObjectiveImmune 
     # Can't have multiple objectives to help/save the same person
     - !type:TargetObjectiveMindFilter
       blacklist:
@@ -172,6 +183,10 @@
       whitelist:
         components:
         - TraitorRole
+    - !type:BodyMindFilter # DeltaV - TargetObjectiveImmune
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     # Can't help anyone who is tasked with helping:
     # 1. thats boring
     # 2. no cyclic progress dependencies!!!

Resources/Prototypes/_DV/Entities/Objects/Misc/implanters.yml

@@ -33,7 +33,7 @@
 - type: entity
   parent: BaseImplantOnlyImplanterCentcomm
   id: CentCommImplanter
-  name: centcomm implanter
+  name: centcomm mindshield implanter
   suffix: mindshield
   components:
   - type: Implanter

Resources/Prototypes/_DV/Entities/Objects/Misc/subdermal_implants.yml

@@ -95,6 +95,8 @@
     componentsToAdd:
     - type: AntagImmune
     - type: MindShield
+    - type: TargetObjectiveImmune
+    - type: PsionicInsulation
 
 # Nukie implants
 

Resources/Prototypes/_DV/Objectives/asakim.yml

@@ -35,6 +35,9 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist: # DeltaV - TargetObjectiveImmune
+        components:
+        - TargetObjectiveImmune 
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:

Resources/Prototypes/_DV/Objectives/menaceskeleton.yml

@@ -38,6 +38,10 @@
     title: objective-skeleton-haunt-title
   - type: PickRandomPerson
     filters:
+    - !type:BodyMindFilter
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     - !type:TargetObjectiveMindFilter
       blacklist:
         components:
@@ -61,6 +65,9 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist:
+        components:
+        - TargetObjectiveImmune
 
 - type: entity
   parent: SkeletonBaseObjective

Resources/Prototypes/_DV/Objectives/ninja.yml

@@ -24,12 +24,20 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist: # DeltaV - TargetObjectiveImmune
+        components:
+        - TargetObjectiveImmune
 
 - type: entity
   parent: BaseNinjaTeachLessonObjective
   id: NinjaTeachLessonRandomPersonObjective
   components:
   - type: PickRandomPerson
+    filters:  # DeltaV - Add TargetObjectiveImmune filter
+    - !type:BodyMindFilter
+      blacklist:
+        components:
+        - TargetObjectiveImmune
 
 - type: entity
   parent: [ BaseNinjaObjective, BaseKillObjective ]
@@ -48,6 +56,9 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist: # DeltaV - TargetObjectiveImmune
+        components:
+        - TargetObjectiveImmune
 
   - type: KillPersonCondition
     requireDead: true

Resources/Prototypes/_DV/Objectives/roboneuroticist.yml

@@ -50,6 +50,10 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist:
+        components:
+        - TargetObjectiveImmune
+
   - type: KillPersonCondition
     requireDead: true
 

Resources/Prototypes/_DV/Objectives/skia.yml

@@ -20,6 +20,10 @@
     title: objective-condition-reap-soul-title
   - type: PickRandomPerson
     filters:
+    - !type:BodyMindFilter
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:

Resources/Prototypes/_DV/Objectives/traitor.yml

@@ -105,6 +105,9 @@
       whitelist:
         components:
         - CommandStaff
+      blacklist: # DeltaV - TargetObjectiveImmune
+        components:
+        - TargetObjectiveImmune
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:

Resources/Prototypes/_DV/Objectives/wizard.yml

@@ -89,6 +89,10 @@
     title: objective-condition-wizard-preserve-person-title
   - type: PickRandomPerson
     filters:
+    - !type:BodyMindFilter
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     - !type:BodyMindFilter
       whitelist:
         components:
@@ -108,6 +112,10 @@
     title: objective-condition-wizard-kill-person-title
   - type: PickRandomPerson
     filters:
+    - !type:BodyMindFilter
+      blacklist:
+        components:
+        - TargetObjectiveImmune
     # Can't have multiple objectives to kill the same person.
     - !type:TargetObjectiveMindFilter
       blacklist:

Resources/Prototypes/_Goobstation/Entities/Misc/implanters.yml

@@ -32,6 +32,7 @@
 - type: entity
   id: BluespaceLifelineImplanter
   suffix: bluespace lifeline
+  name: centcomm bluespace lifeline implanter
   parent: BaseImplantOnlyImplanterCentcomm
   components:
   - type: Implanter