diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index df08dd6c996..ec6c6b2ab92 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -669,6 +669,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) // Operating Table / Beds / Lockers /obj/structure/bed/abductor diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 46bcdcc246d..b343f461d59 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -27,6 +27,10 @@ item_state = "chef" dog_fashion = /datum/dog_fashion/head/chef + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/collectable/paper name = "collectable paper hat" desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 7b2947125ea..6fec7b85f9f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -10,6 +10,10 @@ put_on_delay = 10 dog_fashion = /datum/dog_fashion/head/chef + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + //Captain /obj/item/clothing/head/caphat name = "captain's hat" @@ -92,6 +96,10 @@ icon_state = "beret" dog_fashion = /datum/dog_fashion/head/beret + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/durathread name = "durathread beret" desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer." @@ -114,6 +122,10 @@ icon_state = "beret_hos_black" dog_fashion = /datum/dog_fashion/head/HoS + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/warden name = "warden's police hat" desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts." @@ -146,32 +158,56 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/beret/sec + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/sec/warden name = "warden's beret" desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." icon_state = "beret_warden" armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 30, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/eng name = "engineering beret" desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety." icon_state = "beret_engineering" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/atmos name = "atmospherics beret" desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing." icon_state = "beret_atmospherics" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/ce name = "chief engineer's beret" desc = "A white beret with the engineering insignia emblazoned on it. Its owner knows what they're doing. Probably." icon_state = "beret_ce" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/sci name = "science beret" desc = "A purple beret with the science insignia emblazoned on it. It has that authentic burning plasma smell." icon_state = "beret_sci" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + //Medical /obj/item/clothing/head/beret/med name = "medical beret" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 5d44d924000..828abcb2a29 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -30,12 +30,24 @@ /obj/item/clothing/head/beret/blue icon_state = "beret_blue" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/black icon_state = "beret_black" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/purple_normal icon_state = "beret_purple_normal" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/that name = "top-hat" desc = "It's an amish looking hat." @@ -181,6 +193,10 @@ icon_state = "bandana" item_state = "bandana" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + //stylish bs12 hats /obj/item/clothing/head/bowlerhat @@ -196,6 +212,10 @@ item_state = "beaver_hat" desc = "Like a top hat, but made of beavers." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/boaterhat name = "boater hat" icon_state = "boater_hat" @@ -299,6 +319,10 @@ item_state = "bearpelt" flags = BLOCKHAIR + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/xenos name = "xeno helmet" desc = "A helmet made out of chitinous alien hide." @@ -361,6 +385,10 @@ icon_state = "beret_purple" item_state = "purpleberet" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/centcom/officer name = "officer beret" desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen." @@ -368,6 +396,10 @@ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 20, ACID = 50) strip_delay = 60 + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/centcom/officer/navy name = "navy blue officer beret" desc = "A navy blue beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen." @@ -375,11 +407,19 @@ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 20, ACID = 50) strip_delay = 60 + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/beret/centcom/captain name = "captain's beret" desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy." icon_state = "beret_centcom_captain" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/sombrero name = "sombrero" icon_state = "sombrero" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index b1ef8680a4f..979082251c5 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -445,52 +445,88 @@ item_color = "red" desc = "It's a red bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/blue name = "blue bandana" icon_state = "bandblue" item_color = "blue" desc = "It's a blue bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/gold name = "gold bandana" icon_state = "bandgold" item_color = "yellow" desc = "It's a gold bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/green name = "green bandana" icon_state = "bandgreen" item_color = "green" desc = "It's a green bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/orange name = "orange bandana" icon_state = "bandorange" item_color = "orange" desc = "It's an orange bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/purple name = "purple bandana" icon_state = "bandpurple" item_color = "purple" desc = "It's a purple bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/botany name = "botany bandana" desc = "It's a green bandana with some fine nanotech lining." icon_state = "bandbotany" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/skull name = "skull bandana" desc = "It's a black bandana with a skull pattern." icon_state = "bandskull" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/black name = "black bandana" icon_state = "bandblack" item_color = "black" desc = "It's a black bandana." + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/mask/bandana/durathread name = "durathread bandana" desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..." diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index abed3c94698..b016104a43d 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -87,6 +87,10 @@ flags = STOPSPRESSUREDMAGE | THICKMATERIAL flags_inv = null + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov name = "\improper Trans-Solar Federation commander's beret" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 22675ca4ad9..834e08a756d 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -633,6 +633,10 @@ icon_state = "beret_hos" item_state = "beret_hos" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/pirate/fluff/stumpy //MrFroztee: Stumpy name = "The Sobriety Skullcap" desc = "A hat suited for the king of the pirates" diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 2da9d0163d2..49d24cf838e 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -9,6 +9,10 @@ bitesize_mod = 2 tastes = list("ambrosia" = 1) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + // Ambrosia Vulgaris /obj/item/seeds/ambrosia name = "pack of ambrosia vulgaris seeds" @@ -55,6 +59,10 @@ wine_power = 0.5 tastes = list("ambrosia deus" = 1) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + //Ambrosia Gaia /obj/item/seeds/ambrosia/gaia name = "pack of ambrosia gaia seeds" diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index f0863972166..fa7271f5926 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ