Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-09-29 21:53:16 +01:00
7 changed files with 1085 additions and 715 deletions
@@ -771,6 +771,12 @@
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/melanie_skeleton
path = /obj/item/clothing/under/fluff/slime_skeleton
display_name = "Melanie's Skeleton"
ckeywhitelist = list("vorrarkul")
character_name = list("Melanie Farmer")
/datum/gear/fluff/nyssa_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
display_name = "Nyssa's Coat"