Merge branch 'master' into upstream-merge-12288

This commit is contained in:
Nadyr
2022-02-19 20:48:23 -05:00
committed by GitHub
141 changed files with 2809 additions and 1016 deletions
@@ -879,6 +879,20 @@
ckeywhitelist = list("scree")
character_name = list("Scree")
/datum/gear/fluff/avida_dress
path = /obj/item/clothing/under/skirt/outfit/fluff/avida
display_name = "Avida's Dress"
slot = slot_w_uniform
ckeywhitelist = list("scree")
character_name = list("Avida")
/datum/gear/fluff/avida_hat
path = /obj/item/clothing/head/fluff/avida
display_name = "Avida's Hat"
slot = slot_head
ckeywhitelist = list("scree")
character_name = list("Avida")
/datum/gear/fluff/alfonso_sunglasses
path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso
display_name = "Alfonso's Sunglasses"
@@ -1024,6 +1038,11 @@
character_name = list("Konor Foxe")
// U CKEYS
/datum/gear/fluff/brad_jordans
path = /obj/item/clothing/shoes/fluff/airjordans
display_name = "Bradley's Air Jordans"
ckeywhitelist = list("unclefruitvevo")
character_name = list("Bradley Khatibi")
// V CKEYS
/datum/gear/fluff/cameron_glasses