From fbebae4d1b4ea0f9f989ad5bb531670f3a14b6bf Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 24 Mar 2022 18:32:17 -0700 Subject: [PATCH] powder that makes you say yes --- code/datums/components/crafting/recipes/weapons.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 24a456f651..68f01b54e9 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -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