cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the infina-scoped-rifle bug

Browse Source
This commit is contained in:
Casey
2022-03-23 02:35:40 -04:00
committed by CHOMPStation2
parent f8325863d6
commit 396b201cf7
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/datums/components/crafting/recipes/weapons.dm
View File

@@ -56,3 +56,15 @@
time = 120 time = 120
category = CAT_WEAPONRY category = CAT_WEAPONRY
subcategory = CAT_WEAPON 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