Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2017-08-29 21:19:22 -05:00
parent 6c76ae2395 3a015fc2f0
commit b2114a7b81
5 changed files with 1068 additions and 1056 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