diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 6f70ad1a875..c304156a594 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -31,7 +31,7 @@
 		spawn(10)
 			process_cooldown()
 
-//		signal()
+		signal()
 		return 1
 
 	update_icon()
diff --git a/code/modules/research/xenoarchaeology/artifact_effect.dm b/code/modules/research/xenoarchaeology/artifact_effect.dm
index 34f1df0619a..9bee8176db3 100644
--- a/code/modules/research/xenoarchaeology/artifact_effect.dm
+++ b/code/modules/research/xenoarchaeology/artifact_effect.dm
@@ -143,6 +143,8 @@
 					randomturfs.Add(T)
 				if(randomturfs.len > 0)
 					user << "\red You are suddenly zapped away elsewhere!"
+					if (user.buckled)
+						user.buckled.unbuckle()
 					user.loc = pick(randomturfs)
 					var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 					sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
@@ -334,6 +336,8 @@
 						randomturfs.Add(T)
 					if(randomturfs.len > 0)
 						M << "\red You are displaced by a strange force!"
+						if(M.buckled)
+							M.buckled.unbuckle()
 						M.loc = pick(randomturfs)
 						var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 						sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
@@ -421,6 +425,8 @@
 						randomturfs.Add(T)
 					if(randomturfs.len > 0)
 						M << "\red You are displaced by a strange force!"
+						if(M.buckled)
+							M.buckled.unbuckle()
 						M.loc = pick(randomturfs)
 						var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 						sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is