Merge branch 'master' into singerydonator

This commit is contained in:
LetterJay
2019-07-05 14:31:31 -05:00
committed by GitHub
97 changed files with 1140 additions and 153 deletions
@@ -428,3 +428,10 @@ datum/gear/darksabresheath
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/singery
ckeywhitelist = list("maxlynchy")
/datum/gear/csheet
name = "NT Bedsheet"
category = SLOT_NECK
path = /obj/item/bedsheet/captain
ckeywhitelist = list("tikibomb")