Merge branch 'master' into bark-box

This commit is contained in:
ItzGabby
2021-03-19 02:48:31 -04:00
159 changed files with 2749 additions and 1120 deletions
@@ -549,3 +549,8 @@
path = /obj/item/clothing/mask/breath/mmask
ckeywhitelist = list("sneka")
/datum/gear/donator/smaiden
name = "Shrine Maiden"
slot = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/smaiden
ckeywhitelist = list("ultimarifox")
@@ -199,6 +199,10 @@
name = "Tactitool Turtleneck"
path = /obj/item/clothing/under/syndicate/cosmetic
/datum/gear/uniform/skirtleneck
name = "Tactitool Skirtleneck"
path = /obj/item/clothing/under/syndicate/cosmetic/skirt
/datum/gear/uniform/sweater
name = "Cream Commando Sweater"
path = /obj/item/clothing/under/sweater