Merge branch 'master' into throwing-overhaul

angelofallars · Dec 8, 2024 · c543aa5 · c543aa5
2 parents 8f8f1fa + 3ae4370
commit c543aa5
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 73 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8474,3 +8474,19 @@ Entries:
   id: 6564
   time: '2024-12-06T20:30:45.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1321
+- author: fenndragon
+  changes:
+    - type: Tweak
+      message: Moved the uplink deception category into utility.
+  id: 6565
+  time: '2024-12-07T13:31:16.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1309
+- author: Remuchi
+  changes:
+    - type: Add
+      message: >-
+        Reintroduced 3 traitors objectives: steal Ian's meat, Die Glorious Death
+        and Hijack Evacuation Shuttle
+  id: 6566
+  time: '2024-12-07T14:46:48.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1323
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -509,7 +509,7 @@
   cost:
     Telecrystal: 3
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkStealthBox
@@ -519,7 +519,7 @@
   cost:
     Telecrystal: 5
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkChameleonProjector
@@ -529,7 +529,7 @@
   cost:
     Telecrystal: 7
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkCyberpen
@@ -539,7 +539,7 @@
   cost:
     Telecrystal: 1
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkDecoyDisk
@@ -549,7 +549,7 @@
   cost:
     Telecrystal: 1
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkUltrabrightLantern
@@ -559,7 +559,7 @@
   cost:
     Telecrystal: 2
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 - type: listing
   id: UplinkBribe
@@ -569,7 +569,7 @@
   cost:
     Telecrystal: 4
   categories:
-    - UplinkDeception
+    - UplinkUtility
 
 # - type: listing
 #   id: UplinkGigacancerScanner
@@ -579,7 +579,7 @@
 #   cost:
 #     Telecrystal: 5
 #   categories:
-#   - UplinkDeception
+#   - UplinkUtility
 
 - type: listing
   id: UplinkHolster
@@ -974,7 +974,7 @@
   cost:
     Telecrystal: 4
   categories:
-  - UplinkDeception
+  - UplinkUtility
 
 # Disruption
 
@@ -1788,3 +1788,4 @@
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
+
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -16,7 +16,7 @@
     RDHardsuitStealObjective: 1
     NukeDiskStealObjective: 1
     MagbootsStealObjective: 1
-    # CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective
+    CorgiMeatStealObjective: 1
     MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
     ClipboardStealObjective: 1
     CaptainGunStealObjective: 0.5
@@ -38,8 +38,8 @@
   id: TraitorObjectiveGroupState
   weights:
     EscapeShuttleObjective: 1
-    # DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification
-    #HijackShuttleObjective: 0.02
+    DieObjective: 0.05
+    HijackShuttleObjective: 0.02
 
 - type: weightedRandom
   id: TraitorObjectiveGroupSocial
@@ -48,7 +48,6 @@
     RandomTraitorProgressObjective: 1
     RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
 
-
 #Thief groups
 - type: weightedRandom
   id: ThiefObjectiveGroups
@@ -67,37 +66,35 @@
   weights:
     ThiefObjectiveGroupEscape: 1
 
-
-
 - type: weightedRandom
   id: ThiefObjectiveGroupCollection
   weights:
-    HeadCloakStealCollectionObjective: 1           #command
+    HeadCloakStealCollectionObjective: 1 #command
     HeadBedsheetStealCollectionObjective: 1
     StampStealCollectionObjective: 1
     DoorRemoteStealCollectionObjective: 1
-    TechnologyDiskStealCollectionObjective: 1        #rnd
-    FigurineStealCollectionObjective: 0.3          #service
+    TechnologyDiskStealCollectionObjective: 1 #rnd
+    FigurineStealCollectionObjective: 0.3 #service
     IDCardsStealCollectionObjective: 1
     LAMPStealCollectionObjective: 2 #only for moth
 
 - type: weightedRandom
   id: ThiefObjectiveGroupItem
   weights:
-    ForensicScannerStealObjective: 1                    #sec
+    ForensicScannerStealObjective: 1 #sec
     FlippoEngravedLighterStealObjective: 0.5
     ClothingHeadHatWardenStealObjective: 1
-    ClothingOuterHardsuitVoidParamedStealObjective: 1   #med
+    ClothingOuterHardsuitVoidParamedStealObjective: 1 #med
     MedicalTechFabCircuitboardStealObjective: 1
     ClothingHeadsetAltMedicalStealObjective: 1
-    FireAxeStealObjective: 1                            #eng
+    FireAxeStealObjective: 1 #eng
     AmePartFlatpackStealObjective: 1
-    ExpeditionsCircuitboardStealObjective: 1            #sup
+    ExpeditionsCircuitboardStealObjective: 1 #sup
     CargoShuttleCircuitboardStealObjective: 1
     SalvageShuttleCircuitboardStealObjective: 1
-    ClothingEyesHudBeerStealObjective: 1                #srv
+    ClothingEyesHudBeerStealObjective: 1 #srv
     BibleStealObjective: 1
-    ClothingNeckGoldmedalStealObjective: 1              #other
+    ClothingNeckGoldmedalStealObjective: 1 #other
     ClothingNeckClownmedalStealObjective: 0.5
 
 - type: weightedRandom