Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DeltaFire
2020-09-26 15:50:33 +02:00
@@ -565,4 +565,6 @@
icon_state = "halo"
item_state = "halo"
icon = 'icons/mob/clothing/custom_w.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
dynamic_hair_suffix = ""