Fixes traps not triggering when shuttlecrushed

cmss13-devs · Feb 26, 2024 · fa09cb2 · fa09cb2
1 parent d728744
commit fa09cb2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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()