Revert "Revert "Merge branch 'master' into cumcom""

This reverts commit c2cc5c49c6.
This commit is contained in:
Dahlular
2021-04-29 17:46:09 -06:00
parent c2cc5c49c6
commit 4150636fa4
97 changed files with 5353 additions and 4895 deletions
@@ -319,6 +319,9 @@
new R(src)
revealed = TRUE
/obj/item/storage/backpack/satchel/flat/secret/chloe_ruin
reward_one_of_these = list(/obj/item/book/granter/spell/summonitem, /obj/item/book_of_babel)
/obj/item/storage/backpack/duffelbag
name = "duffel bag"
desc = "A large duffel bag for holding extra things."