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
@@ -401,7 +401,7 @@
// -----------------------------
// Quiver (arrow bag)
// -----------------------------
/obj/item/weapon/storage/bag/quiver
/obj/item/storage/bag/quiver
name = "quiver"
icon = 'icons/obj/storage.dmi'
icon_state = "quiver"
@@ -410,4 +410,4 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
can_hold = list(/obj/item/weapon/arrow/wood)
can_hold = list(/obj/item/arrow/wood)