Merge pull request #462 from SueTheCake/guncode

Zoom optimizations.

code/modules/mob/living/carbon/human/life.dm

@@ -1336,7 +1336,14 @@
 			if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
 			if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
 			if(client)
-				if(client.view != world.view)if(client.view != world.view) // If mob moves while zoomed in with device, unzoom them.
+				if(client.view != world.view) // If mob moves while zoomed in with device, unzoom them.
+					for(var/obj/item/item in contents)
+						if(item.zoom)
+							item.zoom()
+							break
+
+
+				/*
 					if(locate(/obj/item/weapon/gun/energy/rifle/sniperrifle, contents))
 						var/obj/item/weapon/gun/energy/rifle/sniperrifle/s = locate() in src
 						if(s.zoom)
@@ -1345,7 +1352,7 @@
 						var/obj/item/weapon/gun/energy/laser/modular/s = locate() in src
 						if(s.zoom)
 							s.zoom()
-
+				*/
 		else
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			see_in_dark = species.darksight

code/modules/mob/mob_movement.dm

@@ -190,6 +190,12 @@
 			return
 		if(mob.client)
 			if(mob.client.view != world.view)
+				for(var/obj/item/item in mob.contents)
+					if(item.zoom)
+						item.zoom()
+						break
+
+			/*
 				if(locate(/obj/item/weapon/gun/energy/rifle/sniperrifle, mob.contents))		// If mob moves while zoomed in with sniper rifle, unzoom them.
 					var/obj/item/weapon/gun/energy/rifle/sniperrifle/s = locate() in mob
 					if(s.zoom)
@@ -198,6 +204,7 @@
 					var/obj/item/weapon/gun/energy/laser/modular/s = locate() in mob
 					if(s.zoom)
 						s.zoom()
+			*/
 
 	if(Process_Grab())	return