From 396b201cf70fb27a2dbf30d7c25f83dc0993ad08 Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Wed, 23 Mar 2022 02:35:40 -0400
Subject: [PATCH] Fixes the infina-scoped-rifle bug

---
 code/datums/components/crafting/recipes/weapons.dm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm
index b8fe974e05..24a456f651 100644
--- a/code/datums/components/crafting/recipes/weapons.dm
+++ b/code/datums/components/crafting/recipes/weapons.dm
@@ -56,3 +56,15 @@
 	time = 120
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
+<<<<<<< HEAD
+=======
+
+/datum/crafting_recipe/scopedrifle
+	name = "Bolt scope to bolt-action (cannot be removed)"
+	result = /obj/item/weapon/gun/projectile/shotgun/pump/rifle/scoped
+	reqs = list(list(/obj/item/device/binoculars/scope = 1), 
+		list(/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 1))
+	time = 180
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+>>>>>>> 990fb0399e... Merge pull request #12511 from BonniePandora/Unfucks-crafting