Merge remote-tracking branch 'origin/master' into hardsync-1.5

This commit is contained in:
Letter N
2021-02-19 10:34:47 +08:00
67 changed files with 3347 additions and 94 deletions
@@ -526,3 +526,8 @@
new /obj/item/book/granter/martial/carp(src)
new /obj/item/clothing/suit/hooded/carp_costume(src)
new /obj/item/staff/bostaff(src)
/obj/item/storage/box/syndie_kit/sleepytime/cardpack/PopulateContents()
. = ..()
new /obj/item/cardpack/syndicate(src)
new /obj/item/cardpack/syndicate(src)