Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433

[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-25 21:26:17 -06:00
parent 6205268f7e 094b51e746
commit 134201d185
11 changed files with 498 additions and 269 deletions
@@ -400,7 +400,8 @@

 /obj/item/gun/dropped(mob/user)
 	..()
-	zoom(user,FALSE)
+	if(zoomed)
+		zoom(user,FALSE)
 	if(azoom)
 		azoom.Remove(user)
 	if(alight)