Merge branch 'master' into AsteriskEdgeAntiqueGun&MetemMachine

DeltaV-Station · Feb 20, 2024 · d796659 · d796659
2 parents 7498a37 + 101d478
commit d796659
Show file tree

Hide file tree

Showing 8 changed files with 4,600 additions and 5,825 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -67,7 +67,7 @@ jobs:
         username: ${{ secrets.PUBLISH_USER }}
         key: ${{ secrets.PUBLISH_KEY }}
         port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/${{ secrets.PUBLISH_USER }}/publish/push.ps1 ${{ github.sha }}
+        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py

diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml
@@ -65,8 +65,6 @@ ClothingHeadHoodMystic: ClothingHeadHoodMysta
 VendingMachineMailDrobe: VendingMachineCourierDrobe
 
 #Delta V temporary changes. Remove When items are added.
-MetempsychoticMachine: CloningPod
-MetempsychoticMachineCircuitboard: CloningPodMachineCircuitboard
 ComputerShipyard: ComputerBroken
 ShipyardComputerCircuitboard: null
 SpawnMobGolemCult: null

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -198,9 +198,11 @@
       prob: 0.02
     - id: MobMouse2
       prob: 0.02
-    specialEntries:
-    - id: SpawnPointGhostRatKing
-      prob: 0.005
+    # DeltaV - Rat King spawns under MidRoundAntag - Comment out Rat King from spawning with MouseMigration gamerule
+    # specialEntries:
+    # - id: SpawnPointGhostRatKing
+    #   prob: 0.005
+    # End of modified code
 
 - type: entity
   id: CockroachMigration

diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -12,18 +12,18 @@
       earliestStart: 15
     - type: NoosphericStormRule
 
-# Rat king, paradox anomaly, fugitive, oneiro, etc.
-#- type: entity
-#  id: MidRoundAntag
-#  parent: BaseGameRule
-#  noSpawn: true
-#  components:
-#    - type: StationEvent
-#      weight: 7
-#      reoccurrenceDelay: 5
-#      minimumPlayers: 15
-#      earliestStart: 25
-#    - type: MidRoundAntagRule
+# Rat king and paradox anomaly.
+- type: entity
+  id: MidRoundAntag
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+    - type: StationEvent
+      weight: 7
+      reoccurrenceDelay: 5
+      minimumPlayers: 15
+      earliestStart: 25
+    - type: MidRoundAntagRule
 
 # Base glimmer event
 - type: entity