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
@@ -559,3 +559,12 @@
 	icon = 'icons/obj/custom.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	mutantrace_variation = NONE
+
+/obj/item/clothing/head/halo
+	name = "transdimensional halo"
+	desc = "An oddly shaped halo that magically hovers above the head."
+	icon_state = "halo"
+	item_state = "halo"
+	icon = 'icons/mob/clothing/custom_w.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+	mutantrace_variation = NONE