Merge branch 'master' into override-override

2018-09-28 01:49:35 -05:00
parent 2daa197605 7740369d10
commit e4cdb0c853
14 changed files with 780 additions and 700 deletions
@@ -397,3 +397,11 @@
 	desc = "Comfy Lucky Jackboots with the word Luck on them."
 	item_state = "luckyjack"
 	icon_state = "luckyjack"
+
+/obj/item/clothing/under/lunasune
+	name = "Divine Robes"
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	desc = "Heavenly robes of the kitsune Luna Pumpkin,you can feel radiance coming from them."
+	item_state = "Divine_robes"
+	icon_state = "Divine_robes"