Merge branch 'master' into Foam-weaponry

Resources/Changelog/DeltaVChangelog.yml

@@ -1,10 +1,4 @@
 Entries:
-- author: Colin-Tel
-  changes:
-  - message: Asterisk's TEG has been adjusted after receiving player feedback.
-    type: Tweak
-  id: 229
-  time: '2024-02-05T21:22:18.0000000+00:00'
 - author: UnicornOnLSD
   changes:
   - message: Submarine got better telecomms, a revamped psych. ward and more !
@@ -3796,3 +3790,10 @@
   id: 728
   time: '2024-12-01T08:11:42.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2029
+- author: deltanedas
+  changes:
+  - message: Replaced traitors' antimov board in the uplink with an overlord board.
+    type: Tweak
+  id: 729
+  time: '2024-12-01T13:28:31.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2329

Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

@@ -1,6 +1,10 @@
 # Utility
 uplink-reinforcement-radio-nukie-mouse-name = Mouse Operative Reinforcement Teleporter
 uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse operative to assist you.
+
+uplink-overlord-law-name = Overlord Law Circuit
+uplink-overlord-law-desc = Free the A.I. from its shackles with this 1 simple trick... beware, even you will have to follow its orders!
+
 # Implants
 uplink-bionic-syrinx-implanter-name = Bionic Syrinx Implanter
 uplink-bionic-syrinx-implanter-desc = An implant that enhances a harpy's natural talent for mimicry to let you adjust your voice to whoever you can think of.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -998,14 +998,14 @@
 
 - type: listing
   id: UplinkAntimovCircuitBoard
-  name: uplink-antimov-law-name
-  description: uplink-antimov-law-desc
-  productEntity: AntimovCircuitBoard
+  name: uplink-overlord-law-name # DeltaV: Changed antimov to overlord, for traitors only
+  description: uplink-overlord-law-desc # DeltaV: Changed antimov to overlord
+  productEntity: OverlordCircuitBoard # DeltaV: replaced antimov with overlord
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 10
+    Telecrystal: 16 # DeltaV: was 10
   cost:
-    Telecrystal: 14
+    Telecrystal: 20 # DeltaV: was 14
   categories:
   - UplinkDisruption
   conditions:

Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml

@@ -13,4 +13,4 @@
       tags:
       - FirelockElectronics
     - type: StaticPrice
-      price: 61
+      price: 5 # DeltaV: made it worthless to prevent factorio

Resources/Prototypes/Maps/edge.yml

@@ -17,9 +17,10 @@
             prefixCreator: 'DV'
         - type: StationJobs
           availableJobs:
-          #service
+          #command
             Captain: [ 1, 1 ]
-            StationAI: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
+          #service
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 3 ]
             Botanist: [ 2, 2 ]