diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 435ed5ff30..447c11da19 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -234,6 +234,11 @@ /datum/gear/head/kitty display_name = "kitty ears" path = /obj/item/clothing/head/kitty +// CHOMPEdit Start +/datum/gear/head/halo // chompedits + display_name = "holographic demonic halo" + path = /obj/item/clothing/head/halo +//CHOMPEdit End /datum/gear/head/rabbit display_name = "rabbit ears" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 843f6e9001..ca99402a54 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -635,7 +635,7 @@ if(usr.stat || usr.restrained() || usr.incapacitated()) return - + //CHOMPEdit begin if(istype(usr, /mob/living/carbon/human)) var/mob/living/carbon/human/H = usr diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 3ea3b10715..05707193d9 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -172,3 +172,12 @@ icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "tiny_tophat" + +// CHOMPEdit Start +/obj/item/clothing/head/halo + name = "holographic demonic halo" + desc = "A hologram displaying a demonic halo." + icon = 'modular_chomp/icons/inventory/head/item.dmi' + default_worn_icon = 'modular_chomp/icons/inventory/head/mob_halo.dmi' + icon_state = "halo" +// CHOMPEdit End diff --git a/modular_chomp/icons/inventory/head/item.dmi b/modular_chomp/icons/inventory/head/item.dmi index 3e1474c21c..6e631a9b63 100644 Binary files a/modular_chomp/icons/inventory/head/item.dmi and b/modular_chomp/icons/inventory/head/item.dmi differ diff --git a/modular_chomp/icons/inventory/head/mob_halo.dmi b/modular_chomp/icons/inventory/head/mob_halo.dmi new file mode 100644 index 0000000000..091d6eb78e Binary files /dev/null and b/modular_chomp/icons/inventory/head/mob_halo.dmi differ