cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 20:54:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-03-24 18:32:17 -07:00
committed by GitHub
parent 396b201cf7
commit fbebae4d1b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/crafting/recipes/weapons.dm
-3
View File
@@ -56,8 +56,6 @@
time = 120
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
<<<<<<< HEAD
=======
/datum/crafting_recipe/scopedrifle
name = "Bolt scope to bolt-action (cannot be removed)"
@@ -67,4 +65,3 @@
time = 180
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
>>>>>>> 990fb0399e... Merge pull request #12511 from BonniePandora/Unfucks-crafting