diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 4a3d5ee87ac..6e68d72fb0d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -444,6 +444,8 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 	var/current_time = world.time
 	if(!M || !M.client || (M.shakecamera > current_time)|| M.stat || isEye(M) || isAI(M))
 		return
+	if(((M.client.view != world.view) || (M.client.pixel_x != 0) || (M.client.pixel_y != 0))) //to prevent it while zooming, because zoom does not play well with this code
+		return
 	M.shakecamera = current_time + max(TICKS_PER_RECOIL_ANIM, duration)
 	strength = abs(strength)*PIXELS_PER_STRENGTH_VAL
 	var/steps = min(1, Floor(duration/TICKS_PER_RECOIL_ANIM))-1
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index fff7b2e78f5..951ed52a6f3 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -24,6 +24,21 @@
 	desc = "A replica of a traditional adhomian bolt action rifle. It has the seal of the Grand Romanovich Casino on its stock. Uses 7.62mm rounds."
 	ammo_type = /obj/item/ammo_casing/a762/blank
 
+/obj/item/gun/projectile/shotgun/pump/rifle/scope
+	name = "sniper bolt action rifle"
+	desc = "A cheap ballistic rifle often found in the hands of Tajaran conscripts. This one has a telescopic sight attached to it. Uses 7.62mm rounds."
+	icon = 'icons/obj/guns/bolt_scope.dmi'
+
+/obj/item/gun/projectile/shotgun/pump/rifle/scope/verb/scope()
+	set category = "Object"
+	set name = "Use Scope"
+	set popup_menu = 1
+
+	if(wielded)
+		toggle_scope(2.0, usr)
+	else
+		to_chat(usr, SPAN_WARNING ("You can't look through the scope without stabilizing the rifle!"))
+
 /obj/item/gun/projectile/shotgun/pump/rifle/saw_off(mob/user, obj/item/tool)
 	icon = 'icons/obj/guns/obrez.dmi'
 	icon_state = "obrez"
diff --git a/html/changelogs/alberyk-bolt.yml b/html/changelogs/alberyk-bolt.yml
new file mode 100644
index 00000000000..95c5a97ef76
--- /dev/null
+++ b/html/changelogs/alberyk-bolt.yml
@@ -0,0 +1,7 @@
+author: Alberyk, Atteria
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a sniper bolt action rifle."
+
diff --git a/icons/obj/guns/bolt_scope.dmi b/icons/obj/guns/bolt_scope.dmi
new file mode 100644
index 00000000000..c4806112506
Binary files /dev/null and b/icons/obj/guns/bolt_scope.dmi differ
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm
index 1bfaa662e0d..010462b6ef2 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dm
@@ -40,11 +40,11 @@
 						/obj/item/gun/projectile/pistol/adhomai = 1,
 						/obj/item/ammo_magazine/mc9mm = 2,
 						/obj/item/grenade/frag = 1,
-						/obj/item/ammo_magazine/d762 = 2
+						/obj/item/ammo_magazine/boltaction = 3
 						)
 
 	l_ear = null
-	back = /obj/item/gun/projectile/dragunov
+	back = /obj/item/gun/projectile/shotgun/pump/rifle/scope
 	id = null
 	l_pocket = /obj/item/material/caltrops
 	r_pocket = /obj/item/material/caltrops
\ No newline at end of file
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm
index 56a624a2283..29a0f0ebf3d 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm
@@ -64,7 +64,7 @@
 
 	suit = /obj/item/clothing/suit/storage/tajaran/hunting
 	id = null
-	suit_store = /obj/item/gun/projectile/shotgun/pump/rifle
+	suit_store = /obj/item/gun/projectile/shotgun/pump/rifle/scope
 	backpack_contents = list(/obj/item/storage/wallet/random = 1)
 
 /datum/ghostspawner/human/matake_hunter
@@ -105,5 +105,5 @@
 				/obj/item/material/sword/sabre/silver
 				)
 	id = null
-	back = /obj/item/gun/projectile/shotgun/pump/rifle
+	back = /obj/item/gun/projectile/shotgun/pump/rifle/scope
 	l_pocket = list(/obj/item/storage/wallet/random = 1)
\ No newline at end of file