Merge branch 'master' into loadout-json

2020-12-06 17:24:24 +00:00
parent 5566c00a69 f2b9b574fe
commit 0f540884eb
245 changed files with 31194 additions and 1645 deletions
@@ -44,6 +44,10 @@
 	name = "Maid costume"
 	path = /obj/item/clothing/under/costume/maid

+/datum/gear/uniform/maidcostume/polychromic
+	name = "Polychromic maid costume"
+	path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic
+
 /datum/gear/uniform/mailmanuniform
 	name = "Mailman's jumpsuit"
 	path = /obj/item/clothing/under/misc/mailman