Merge branch 'master' into master

2019-07-06 16:03:17 +01:00
parent 7fa072030b bd675d3bae
commit cc39c9f896
34 changed files with 248 additions and 34 deletions
@@ -423,8 +423,15 @@ datum/gear/darksabresheath
 	path = /obj/item/clothing/under/trendy_fit
 	ckeywhitelist = list("midgetdragon")

+/datum/gear/singery
+	name = "Yellow Performer Outfit"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/singery
+	ckeywhitelist = list("maxlynchy")
+
 /datum/gear/csheet
 	name = "NT Bedsheet"
 	category = SLOT_NECK
 	path = /obj/item/bedsheet/captain
-	ckeywhitelist = list("tikibomb")
+	ckeywhitelist = list("tikibomb")
+