Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412

[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
2017-07-31 21:59:10 +02:00
parent 409c8ffe3e b953db165d
commit 445fb5a395
2 changed files with 25 additions and 56 deletions
@@ -203,7 +203,7 @@
 		direct_target.bullet_act(src, def_zone)
 		qdel(src)
 		return
-	if(setAngle)
+	if(isnum(setAngle))
 		Angle = setAngle
 	var/old_pixel_x = pixel_x
 	var/old_pixel_y = pixel_y