From b11e3cb9679886fffc0d0742508f51977bbd1adb Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:22:02 +0100
Subject: [PATCH] Hopefully fix subgamemodes from pushing rounds into extended.
 (#42744)

* Hopefully fix subgamemodes from hard locking rounds

* You'd revert this change, you potato...
---
 Resources/Prototypes/GameRules/roundstart.yml | 40 +++++++++++++++++++
 .../Prototypes/GameRules/subgamemodes.yml     | 11 +++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index f0486b478fb..4270d837ea5 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -481,6 +481,46 @@
   - type: DynamicRuleCost
     cost: 200
 
+- type: entity
+  abstract: true
+  parent: BaseGameRule
+  id: BaseXenoborgsRule
+  components:
+  - type: XenoborgsRule
+  - type: RuleGrids
+  - type: LoadMapRule
+    gridPath: /Maps/Shuttles/mothership.yml
+
+- type: entity
+  parent: BaseXenoborgsRule
+  id: Xenoborgs
+  components:
+  - type: GameRule
+    minPlayers: 30
+  - type: AntagMultipleRoleSpawner
+    antagRoleToPrototypes:
+      MothershipCore: [ MothershipCore ]
+      Xenoborg: [ XenoborgEngi, XenoborgHeavy, XenoborgScout, XenoborgStealth ]
+    pickAndTake: true
+  - type: AntagSelection
+    selectionTime: PrePlayerSpawn
+    definitions:
+    - prefRoles: [ MothershipCore ]
+      fallbackRoles: [ Xenoborg ]
+      spawnerPrototype: SpawnPointGhostRoleMothershipCore
+      mindRoles:
+      - MindRoleMothershipCore
+    - prefRoles: [ Xenoborg ]
+      fallbackRoles: [ MothershipCore ]
+      spawnerPrototype: SpawnPointGhostRoleXenoborg
+      mindRoles:
+      - MindRoleXenoborg
+      min: 4
+      max: 4
+  - type: DynamicRuleCost
+    cost: 200
+
+
 # This rule makes the chosen players unable to get other antag rules, as a way to prevent metagaming job rolls.
 # Put this before antags assigned to station jobs, but after non-job antags (NukeOps/Wiz).
 - type: entity
diff --git a/Resources/Prototypes/GameRules/subgamemodes.yml b/Resources/Prototypes/GameRules/subgamemodes.yml
index f9f7f8614fc..10cfb62dd29 100644
--- a/Resources/Prototypes/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/GameRules/subgamemodes.yml
@@ -38,6 +38,8 @@
         sound: "/Audio/Misc/thief_greeting.ogg"
   - type: DynamicRuleCost
     cost: 75
+  - type: GameRule
+    cancelPresetOnTooFewPlayers: false
 
 # Needs testing
 - type: entity
@@ -72,15 +74,16 @@
         nameFormat: name-format-wizard
       mindRoles:
       - MindRoleWizard
+  - type: GameRule
+    cancelPresetOnTooFewPlayers: false
 
 - type: entity
-  parent: BaseGameRule
-  id: Xenoborgs
+  parent: BaseXenoborgsRule
+  id: SubXenoborgs
   components:
-  - type: XenoborgsRule
-  - type: RuleGrids
   - type: GameRule
     minPlayers: 30
+    cancelPresetOnTooFewPlayers: false
   - type: LoadMapRule
     gridPath: /Maps/_DV/Shuttles/Event/mothership_dv.yml #DeltaV - Was: /Maps/Shuttles/mothership.yml
   - type: AntagMultipleRoleSpawner