Merge branch 'master' into upstream-merge-30175

2017-08-29 10:10:23 -07:00
parent 54c68decde 3a015fc2f0
commit d8e4f44a39
1 changed files with 1 additions and 1 deletions
@@ -101,7 +101,7 @@
 				qdel(dummy)
 				return 0
 		for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
-			if(B.owner != current_beam)
+			if(B.owner.origin != current_beam.origin)
 				explosion(B.loc,0,3,5,8)
 				qdel(dummy)
 				return 0