From fa09cb2d89dd53fbdda5e31bb5c742507ba36410 Mon Sep 17 00:00:00 2001
From: Vicacrov <49321394+Vicacrov@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:06:20 +0100
Subject: [PATCH] Fixes traps not triggering when shuttlecrushed

---
 code/modules/cm_aliens/structures/trap.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm
index e4b021e98f46..5e76881e6fac 100644
--- a/code/modules/cm_aliens/structures/trap.dm
+++ b/code/modules/cm_aliens/structures/trap.dm
@@ -29,6 +29,7 @@
 
 	cause_data = create_cause_data("resin trap", X)
 	set_hive_data(src, hivenumber)
+	RegisterSignal(src, COMSIG_MOVABLE_SHUTTLE_CRUSH, PROC_REF(on_shuttle_crushing))
 	if(hivenumber == XENO_HIVE_NORMAL)
 		RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling))
 
@@ -347,6 +348,10 @@
 	if(ismob(A) || isVehicleMultitile(A))
 		HasProximity(A)
 
+/obj/effect/alien/resin/trap/proc/on_shuttle_crushing()
+	UnregisterSignal(src, COMSIG_MOVABLE_SHUTTLE_CRUSH)
+	loc = null
+
 /obj/effect/alien/resin/trap/Destroy()
 	if(trap_type != RESIN_TRAP_EMPTY && loc)
 		trigger_trap()