Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.

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

@@ -1301,7 +1301,13 @@
 			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.
+					for(var/obj/item/item in contents)
+						if(item.zoom)
+							item.zoom()
+							break
+
+					/*
 					if(locate(/obj/item/weapon/gun/energy/sniperrifle, contents))
 						var/obj/item/weapon/gun/energy/sniperrifle/s = locate() in src
 						if(s.zoom)
@@ -1310,6 +1316,7 @@
 						var/obj/item/device/binoculars/b = locate() in src
 						if(b.zoom)
 							b.zoom()
+					*/
 
 		else
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)

code/modules/mob/mob_movement.dm

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

code/modules/projectiles/guns/energy/special.dm

@@ -225,69 +225,11 @@ obj/item/weapon/gun/energy/staff/focus
 	charge_cost = 250
 	fire_delay = 35
 	w_class = 4.0
-	var/zoom = 0
+	zoomdevicename = "sniper scope"
 
-/obj/item/weapon/gun/energy/sniperrifle/dropped(mob/user)
-	user.client.view = world.view
-	user.client.pixel_x = 0
-	user.client.pixel_y = 0
-
-
-
-/*
-This is called from
-modules/mob/mob_movement.dm if you move you will be zoomed out
-modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
-*/
-
-/obj/item/weapon/gun/energy/sniperrifle/verb/zoom()
+/obj/item/weapon/gun/energy/sniperrifle/verb/scope()
 	set category = "Object"
-	set name = "Use Sniper Scope"
+	set name = "Use Scope"
 	set popup_menu = 1
 
-	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
-		usr << "You are unable to focus down the scope of the rifle."
-		return
-	if(!zoom && global_hud.darkMask[1] in usr.client.screen)
-		usr << "Your welding equipment gets in the way of you looking down the scope"
-		return
-	if(!zoom && usr.get_active_hand() != src)
-		usr << "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better"
-		return
-
-	if(usr.client.view == world.view)
-		if(!usr.hud_used.hud_shown)
-			usr.button_pressed_F12(1)	// If the user has already limited their HUD this avoids them having a HUD when they zoom in
-		usr.button_pressed_F12(1)
-		usr.client.view = 12
-		zoom = 1
-
-		var/tileoffset = 11 //client view offset in the direction the user is facing
-		var/tilesize = 32
-		var/viewoffset = tilesize * tileoffset
-
-		switch(usr.dir)
-			if (NORTH)
-				usr.client.pixel_x = 0
-				usr.client.pixel_y = viewoffset
-			if (SOUTH)
-				usr.client.pixel_x = 0
-				usr.client.pixel_y = -viewoffset
-			if (EAST)
-				usr.client.pixel_x = viewoffset
-				usr.client.pixel_y = 0
-			if (WEST)
-				usr.client.pixel_x = -viewoffset
-				usr.client.pixel_y = 0
-
-	else
-		usr.client.view = world.view
-		if(!usr.hud_used.hud_shown)
-			usr.button_pressed_F12(1)
-		zoom = 0
-
-		usr.client.pixel_x = 0
-		usr.client.pixel_y = 0
-
-	usr << "<font color='[zoom?"blue":"red"]'>Zoom mode [zoom?"en":"dis"]abled.</font>"
-	return
+	zoom()