Rebase issues

This commit is contained in:
atermonera
2022-04-17 19:18:15 -08:00
parent 7c807a2f90
commit fec412daaa
8 changed files with 55 additions and 55 deletions
+4 -4
View File
@@ -96,7 +96,7 @@
/datum/crafting_recipe/shortbow
name = "Shortbow"
result = /obj/item/weapon/gun/launcher/crossbow/bow
result = /obj/item/gun/launcher/crossbow/bow
reqs = list(list(/obj/item/stack/material/wood = 10),
list(/obj/item/stack/material/cloth = 5))
time = 120
@@ -105,7 +105,7 @@
/datum/crafting_recipe/arrow_sandstone
name = "Wood arrow (sandstone tip)"
result = /obj/item/weapon/arrow/wood
result = /obj/item/arrow/wood
reqs = list(list(/obj/item/stack/material/wood = 2),
list(/obj/item/stack/material/sandstone = 2))
time = 20
@@ -114,7 +114,7 @@
/datum/crafting_recipe/arrow_marble
name = "Wood arrow (marble tip)"
result = /obj/item/weapon/arrow/wood
result = /obj/item/arrow/wood
reqs = list(list(/obj/item/stack/material/wood = 2),
list(/obj/item/stack/material/marble = 2))
time = 20
@@ -123,7 +123,7 @@
/datum/crafting_recipe/quiver
name = "Arrow quiver"
result = /obj/item/weapon/storage/bag/quiver
result = /obj/item/storage/bag/quiver
reqs = list(list(/obj/item/stack/material/leather = 8))
time = 60
category = CAT_STORAGE