Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff

This commit is contained in:
Amy
2020-11-14 12:55:04 -06:00
83 changed files with 30005 additions and 23862 deletions
@@ -66,6 +66,12 @@
ckeywhitelist = list("argobargsoup")
character_name = list("Lynn Shady")
/datum/gear/fluff/felina_witchhat
path = /obj/item/clothing/head/wizard/marisa/fake
display_name = "Felina's Witch Hat"
ckeywhitelist = list("argobargsoup")
character_name = list("Felina Belliger")
/datum/gear/fluff/aronai_ccmeduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/officer/medical
display_name = "centcom medical uniform"