From ad77c39bce6c30dc3aeac83ea4975064f541703f Mon Sep 17 00:00:00 2001
From: Nyx <80511023+The-Real-Nyx@users.noreply.github.com>
Date: Wed, 2 Sep 2026 23:51:18 -0400
Subject: [PATCH] fix: Activate player units for STC theft battle

The Mechanicus STC theft battle created obj_ncombat and its obj_pnunit
formation columns, then called instance_deactivate_all_safe before
reactivating only obj_ncombat.
The following roster setup uses instance_nearest to select each unit's
destination column. Because instance_nearest ignores deactivated
instances, it returned noone for every marine, so their placement
blocks were skipped. The obj_ncombat setup alarm then had no populated
column against which to measure the player formation and threw an error.

Refs: #1494
---
 objects/obj_popup/Alarm_0.gml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/objects/obj_popup/Alarm_0.gml b/objects/obj_popup/Alarm_0.gml
index 0e7178a9b1..e82f97a5d6 100644
--- a/objects/obj_popup/Alarm_0.gml
+++ b/objects/obj_popup/Alarm_0.gml
@@ -23,6 +23,7 @@ if (battle_special == 3.1) {
 
     instance_deactivate_all_safe();
     instance_activate_object(obj_ncombat);
+    instance_activate_object(obj_pnunit);
 
     _roster = new Roster();
     with (_roster) {
@@ -36,6 +37,7 @@ if (battle_special == 3.1) {
             add_to_battle();
         } else {
             instance_destroy(obj_ncombat);
+            instance_destroy(obj_pnunit);
             instance_activate_all();
             delete _roster;
         }