Nuke disj objective only with escape objective (#2235)

Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml

@@ -0,0 +1,4 @@
+- type: weightedRandom
+  id: TraitorObjectiveGroupNukieDisk
+  weights:
+    NukeDiskStealObjective: 0.05

Resources/Prototypes/Corvax/Objectives/traitorObjectives.yml

@@ -11,3 +11,29 @@
         sprite: Objects/Tools/emag.rsi
         state: icon
     - type: HijackShuttleCondition
+
+- type: entity
+  noSpawn: true
+  parent: BaseCaptainObjective
+  id: NukeDiskStealObjective
+  components:
+  - type: Objective
+    # high difficulty since the hardest item both to steal, and to not get caught down the road,
+    # since anyone with a pinpointer can track you down and kill you
+    # it's close to being a stealth loneop
+    difficulty: 4
+  - type: ObjectiveBlacklistRequirement
+    blacklist:
+      components:
+      - HijackShuttleCondition
+      - KillPersonCondition
+      - RandomTraitorAlive
+      - RandomTraitorProgress
+      - DieCondition
+      - StealCondition
+      - SocialObjective
+      - SurviveCondition
+  - type: NotCommandRequirement
+  - type: StealCondition
+    stealGroup: NukeDisk
+    owner: objective-condition-steal-station

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -6,6 +6,7 @@
     TraitorObjectiveGroupKill: 1
     TraitorObjectiveGroupState: 1 #As in, something about your character. Alive, dead, arrested, gained an ability...
     TraitorObjectiveGroupSocial: 1 #Involves helping/harming others without killing them or stealing their stuff
+    TraitorObjectiveGroupNukieDisk: 1  #Corvax
 
 - type: weightedRandom
   id: TraitorObjectiveGroupSteal
@@ -13,8 +14,8 @@
     CaptainIDStealObjective: 1
     CMOHyposprayStealObjective: 1
     CMOCrewMonitorStealObjective: 1
+    #NukeDiskStealObjective: 1 #Corvax
     RDHardsuitStealObjective: 1
-    NukeDiskStealObjective: 1
     MagbootsStealObjective: 1
     CorgiMeatStealObjective: 1
     ClipboardStealObjective: 1

Resources/Prototypes/Objectives/traitor.yml

@@ -280,16 +280,19 @@
     stealGroup: WeaponAntiqueLaser
     owner: job-name-captain
 
-- type: entity
-  parent: BaseCaptainObjective
-  id: NukeDiskStealObjective
-  components:
-  - type: Objective
-    # high difficulty since the hardest item both to steal, and to not get caught down the road,
-    # since anyone with a pinpointer can track you down and kill you
-    # it's close to being a stealth loneop
-    difficulty: 4
-  - type: NotCommandRequirement
-  - type: StealCondition
-    stealGroup: NukeDisk
-    owner: objective-condition-steal-station
+# Corvax-MRP-Start: Make nuke disk objective separate
+# - type: entity
+  # noSpawn: true
+  # parent: BaseCaptainObjective
+  # id: NukeDiskStealObjective
+  # components:
+  # - type: Objective
+    # # high difficulty since the hardest item both to steal, and to not get caught down the road,
+    # # since anyone with a pinpointer can track you down and kill you
+    # # it's close to being a stealth loneop
+    # difficulty: 4
+  # - type: NotCommandRequirement
+  # - type: StealCondition
+    # stealGroup: NukeDisk
+    # owner: objective-condition-steal-station
+# Corvax-MRP-End