diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index b50d31a6b6..cf346925f2 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -96,6 +96,10 @@ title: objective-condition-maroon-person-title - type: PickRandomPerson filters: + - !type:BodyMindFilter # DeltaV - ObjectiveImmune + blacklist: + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: @@ -122,6 +126,9 @@ whitelist: components: - CommandStaff + blacklist: # DeltaV - ObjectiveImmune + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: @@ -150,6 +157,10 @@ whitelist: components: - TraitorRole + - !type:BodyMindFilter # DeltaV - ObjectiveImmune + blacklist: + components: + - ObjectiveImmune # Can't have multiple objectives to help/save the same person - !type:TargetObjectiveMindFilter blacklist: @@ -172,6 +183,10 @@ whitelist: components: - TraitorRole + - !type:BodyMindFilter # DeltaV - ObjectiveImmune + blacklist: + components: + - ObjectiveImmune # Can't help anyone who is tasked with helping: # 1. thats boring # 2. no cyclic progress dependencies!!! diff --git a/Resources/Prototypes/_DV/Objectives/asakim.yml b/Resources/Prototypes/_DV/Objectives/asakim.yml index 5d35de88f3..e5bdfa525a 100644 --- a/Resources/Prototypes/_DV/Objectives/asakim.yml +++ b/Resources/Prototypes/_DV/Objectives/asakim.yml @@ -35,6 +35,9 @@ whitelist: components: - CommandStaff + blacklist: # DeltaV - ObjectiveImmune + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: diff --git a/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml b/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml index f81377bee0..bf989fcbc8 100644 --- a/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml +++ b/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml @@ -38,6 +38,10 @@ title: objective-skeleton-haunt-title - type: PickRandomPerson filters: + - !type:BodyMindFilter + blacklist: + components: + - ObjectiveImmune - !type:TargetObjectiveMindFilter blacklist: components: @@ -61,6 +65,9 @@ whitelist: components: - CommandStaff + blacklist: + components: + - ObjectiveImmune - type: entity parent: SkeletonBaseObjective diff --git a/Resources/Prototypes/_DV/Objectives/ninja.yml b/Resources/Prototypes/_DV/Objectives/ninja.yml index a35fcc8737..3d9b34dfba 100644 --- a/Resources/Prototypes/_DV/Objectives/ninja.yml +++ b/Resources/Prototypes/_DV/Objectives/ninja.yml @@ -24,12 +24,20 @@ whitelist: components: - CommandStaff + blacklist: # DeltaV - ObjectiveImmune + components: + - ObjectiveImmune - type: entity parent: BaseNinjaTeachLessonObjective id: NinjaTeachLessonRandomPersonObjective components: - type: PickRandomPerson + filters: # DeltaV - Add ObjectiveImmune filter + - !type:BodyMindFilter + blacklist: + components: + - ObjectiveImmune - type: entity parent: [ BaseNinjaObjective, BaseKillObjective ] @@ -48,6 +56,9 @@ whitelist: components: - CommandStaff + blacklist: # DeltaV - ObjectiveImmune + components: + - ObjectiveImmune - type: KillPersonCondition requireDead: true diff --git a/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml b/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml index 98efd929ab..e3f8828595 100644 --- a/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml +++ b/Resources/Prototypes/_DV/Objectives/roboneuroticist.yml @@ -50,6 +50,10 @@ whitelist: components: - CommandStaff + blacklist: + components: + - ObjectiveImmune + - type: KillPersonCondition requireDead: true diff --git a/Resources/Prototypes/_DV/Objectives/skia.yml b/Resources/Prototypes/_DV/Objectives/skia.yml index 927e0c4ed2..2b7677e381 100644 --- a/Resources/Prototypes/_DV/Objectives/skia.yml +++ b/Resources/Prototypes/_DV/Objectives/skia.yml @@ -20,6 +20,10 @@ title: objective-condition-reap-soul-title - type: PickRandomPerson filters: + - !type:BodyMindFilter + blacklist: + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index 1e080e647b..b890bcde96 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/Resources/Prototypes/_DV/Objectives/traitor.yml @@ -105,6 +105,9 @@ whitelist: components: - CommandStaff + blacklist: # DeltaV - ObjectiveImmune + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: diff --git a/Resources/Prototypes/_DV/Objectives/wizard.yml b/Resources/Prototypes/_DV/Objectives/wizard.yml index 748038c707..734f53d4b6 100644 --- a/Resources/Prototypes/_DV/Objectives/wizard.yml +++ b/Resources/Prototypes/_DV/Objectives/wizard.yml @@ -89,6 +89,10 @@ title: objective-condition-wizard-preserve-person-title - type: PickRandomPerson filters: + - !type:BodyMindFilter + blacklist: + components: + - ObjectiveImmune - !type:BodyMindFilter whitelist: components: @@ -108,6 +112,10 @@ title: objective-condition-wizard-kill-person-title - type: PickRandomPerson filters: + - !type:BodyMindFilter + blacklist: + components: + - ObjectiveImmune # Can't have multiple objectives to kill the same person. - !type:TargetObjectiveMindFilter blacklist: