diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index d3ed7059273..d195f31179e 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -43,6 +43,7 @@ icon_state = "tophat" item_state = "that" dog_fashion = /datum/dog_fashion/head + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 2409ba56752..0b198442e12 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -13,7 +13,8 @@ resistance_flags = FIRE_PROOF dog_fashion = /datum/dog_fashion/head/hardhat sprite_sheets = list( - "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/hardhat/attack_self(mob/living/user) @@ -100,5 +101,6 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = null sprite_sheets = list( - "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e2c0ad36fb7..f05a142bbee 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -43,6 +43,10 @@ item_state = "that" dog_fashion = /datum/dog_fashion/head + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" @@ -53,12 +57,20 @@ icon_state = "mailman" desc = "'Right-on-time' mail service head wear." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/plaguedoctorhat name = "plague doctor's hat" desc = "These were once used by Plague doctors. They're pretty much useless." icon_state = "plaguedoctor" permeability_coefficient = 0.01 + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/hasturhood name = "hastur's hood" desc = "It's unspeakably stylish" @@ -169,12 +181,20 @@ item_state = "pirate" dog_fashion = /datum/dog_fashion/head/pirate + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/hgpiratecap name = "pirate hat" desc = "Yarr." icon_state = "hgpiratecap" item_state = "hgpiratecap" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/bandana name = "pirate bandana" desc = "Yarr." @@ -194,6 +214,10 @@ desc = "For that industrial age look." dog_fashion = /datum/dog_fashion/head/bowlerhat + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beaverhat name = "beaver hat" icon_state = "beaver_hat" @@ -210,6 +234,10 @@ item_state = "boater_hat" desc = "Goes well with celery." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/cowboyhat name = "cowboy hat" icon_state = "cowboyhat" @@ -264,6 +292,10 @@ item_state = "fez" desc = "Put it on your monkey, make lots of cash money." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + //end bs12 hats /obj/item/clothing/head/witchwig @@ -273,6 +305,10 @@ item_state = "witch" flags = BLOCKHAIR + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/chicken name = "chicken suit head" desc = "Bkaw!" @@ -397,6 +433,10 @@ desc = "You can practically taste the fiesta." dog_fashion = /datum/dog_fashion/head/sombrero + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/sombrero/green name = "green sombrero" icon_state = "greensombrero" @@ -432,11 +472,19 @@ desc = "A hat with bells, to add some merryness to the suit." icon_state = "jester_hat" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/rice_hat name = "rice hat" desc = "Welcome to the rice fields, motherfucker." icon_state = "rice_hat" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/griffin name = "griffon head" desc = "Why not 'eagle head'? Who knows." @@ -516,3 +564,7 @@ desc = "Now just to find some maracas!" icon_state = "cuban_hat" item_state = "cuban_hat" + + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 7f77f47f402..360e8a01c30 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -109,7 +109,8 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = /datum/dog_fashion/head/ushanka sprite_sheets = list( - "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 44a1261858d..b377654827f 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -53,6 +53,10 @@ magical = FALSE resistance_flags = FLAMMABLE dog_fashion = /datum/dog_fashion/head/blue_wizard + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/wizard/marisa name = "witch hat" @@ -66,6 +70,9 @@ icon_state = "magus" item_state = "magus" dog_fashion = /datum/dog_fashion/head/wizard/magus + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/head/wizard/amp name = "psychic amplifier" diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index c378bb8388d..ff9f25ebd27 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ