Merge pull request #2142 from Citadel-Station-13/upstream-merge-29493

[MIRROR] Fixes guns staying zoomed in after being unequipped
2017-07-26 19:52:19 -05:00
parent 2aacff25ad cc9330a2ec
commit 471f9d064b
1 changed files with 5 additions and 0 deletions
@@ -91,6 +91,11 @@
 	else
 		to_chat(user, "It doesn't have a firing pin installed, and won't fire.")

+/obj/item/weapon/gun/equipped(mob/living/user, slot)
+	. = ..()
+	if(zoomable && user.get_active_held_item() != src)
+		zoom(user, FALSE) //we can only stay zoomed in if it's in our hands
+
 //called after the gun has successfully fired its chambered ammo.
 /obj/item/weapon/gun/proc/process_chamber()
 	return 0