Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt

2020-09-16 11:20:43 -05:00
parent e7ae124006 ff796d3383
commit efa3627460
38 changed files with 2881 additions and 1447 deletions
@@ -515,4 +515,10 @@
 	name = "custom atmos skirt"
 	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/suit/customskirt
-	ckeywhitelist = list("thakyz")
+	ckeywhitelist = list("thakyz")
+
+/datum/gear/donator/hisakaki
+	name = "halo"
+	slot = SLOT_HEAD
+	path = 	/obj/item/clothing/head/halo
+	ckeywhitelist = list("hisakaki")