diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm
index 6f95970e22..a5e1f95527 100644
--- a/code/game/objects/effect_system.dm
+++ b/code/game/objects/effect_system.dm
@@ -410,6 +410,7 @@ steam.start() -- spawns the effect
 	..()
 	var/obj/R = new /obj()
 	R.reagents = new/datum/reagents(500)
+	R.reagents.my_atom = R
 	reagents.trans_to(R, reagents.total_volume/divisor)
 	for(var/atom/A in view(1, src))
 		R.reagents.reaction(A)
@@ -421,6 +422,7 @@ steam.start() -- spawns the effect
 	..()
 	var/obj/R = new /obj()
 	R.reagents = new/datum/reagents(500)
+	R.reagents.my_atom = R
 	reagents.trans_to(R, reagents.total_volume/divisor)
 	R.reagents.reaction(M)
 	del(R)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 55408da6cd..0bc1ff2468 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -125,8 +125,8 @@
 			A.pulse(src.airlock_wire)
 		else if(holder)
 			holder.process_activation(src, 1, 0)
-			else
-				..()
+		else
+			..()
 		return 1