diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index aca34e509b8..3d9cb3ec80d 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -138,6 +138,7 @@ name = "collectable hard hat" desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!" icon_state = "hardhat0_yellow" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' dog_fashion = /datum/dog_fashion/head/hardhat /obj/item/clothing/head/collectable/hos diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index cd3947861be..21c24be2455 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -10,6 +10,7 @@ actions_types = list(/datum/action/item_action/toggle_helmet_light) resistance_flags = FIRE_PROOF dog_fashion = /datum/dog_fashion/head/hardhat + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Grey" = 'icons/mob/clothing/species/grey/head.dmi', "Vox" = 'icons/mob/clothing/species/vox/head.dmi' @@ -94,6 +95,7 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = null + icon_monitor = null sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi', @@ -104,6 +106,10 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head/utility.dmi' ) +/obj/item/clothing/head/hardhat/atmos/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/hardhat/durathread name = "durathread hard hat" icon_state = "hardhat0_durathread" diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index e9a25923058..f596541f58b 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -91,6 +91,10 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) +/obj/item/clothing/head/qm/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + //Nanotrasen Representative /obj/item/clothing/head/ntrep name = "Nanotrasen Representative's hat" @@ -103,6 +107,9 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) +/obj/item/clothing/head/ntrep/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) //Chaplain /obj/item/clothing/head/hooded/chaplain_hood @@ -258,16 +265,17 @@ name = "witchhunter hat" desc = "This hat saw much use back in the day." icon_state = "witchhunterhat" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' flags_cover = HEADCOVERSEYES /obj/item/clothing/head/det_hat name = "hat" desc = "Someone who wears this will look very smart." icon_state = "detective" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' allowed = list(/obj/item/food/candy/candy_corn, /obj/item/pen) armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 20, ACID = 50) dog_fashion = /datum/dog_fashion/head/detective - sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi' @@ -304,6 +312,7 @@ icon_state = "sechat" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 60 + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') /obj/item/clothing/head/drillsgt @@ -327,6 +336,10 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) +/obj/item/clothing/head/rd/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + //Medical /obj/item/clothing/head/cmo name = "chief medical officer's cap" @@ -340,11 +353,16 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) +/obj/item/clothing/head/cmo/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/surgery name = "blue surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" flags = BLOCKHEADHAIR + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Drask" = 'icons/mob/clothing/species/drask/head.dmi', "Vox" = 'icons/mob/clothing/species/vox/head.dmi' @@ -379,3 +397,7 @@ desc = "A wide-brimmed campaign hat with a drill sergeant feel, worn by Career Trainers to project knowledge and guide new employees with classic style." icon_state = "trainercampaign" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') + +/obj/item/clothing/head/drilltrainer/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 3415e62704b..f605047733c 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -8,21 +8,28 @@ armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) strip_delay = 80 +/obj/item/clothing/head/centhat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/hairflower name = "hair flower pin" desc = "Smells nice." icon_state = "hairflower" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/powdered_wig name = "powdered wig" desc = "A powdered wig." icon_state = "pwig" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/justice_wig name = "justice wig" desc = "A fancy powdered wig given to arbitrators of the law. It looks itchy." icon_state = "jwig" dog_fashion = /datum/dog_fashion/head/justice_wig + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/that name = "top-hat" @@ -31,15 +38,21 @@ dog_fashion = /datum/dog_fashion/head sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/that/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" desc = "'I guess it's a redhead.'" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/mailman name = "mailman's hat" icon_state = "mailman" desc = "'Right-on-time' mail service head wear." + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' @@ -53,7 +66,11 @@ sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' - ) + ) + +/obj/item/clothing/head/plaguedoctorhat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) /obj/item/clothing/head/hasturhood name = "hastur's hood" @@ -61,12 +78,14 @@ icon_state = "hasturhood" flags = BLOCKHAIR flags_cover = HEADCOVERSEYES + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi' /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" dog_fashion = /datum/dog_fashion/head/nurse + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/syndicatefake name = "black and red space-helmet replica" @@ -89,6 +108,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list("Grey" = 'icons/mob/clothing/species/grey/head.dmi') /obj/item/clothing/head/snowman @@ -98,12 +118,14 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list("Grey" = 'icons/mob/clothing/species/grey/head.dmi') /obj/item/clothing/head/greenbandana name = "green bandana" desc = "It's a green bandana with some fine nanotech lining." icon_state = "greenbandana" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' flags_inv = 0 /obj/item/clothing/head/rabbitears diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 87b555ce6f7..e6c32adcc98 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -140,6 +140,7 @@ desc = "A jack o' lantern! Believed to ward off evil spirits." icon_state = "hardhat0_pumpkin"//Could stand to be renamed hat_color = "pumpkin" + icon_monitor = null flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH @@ -162,6 +163,7 @@ hat_color = "reindeer" armor = null brightness_on = 1 //luminosity when on + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/reindeer /* diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi index 0e09a267965..605e6efdfea 100644 Binary files a/icons/mob/clothing/species/machine/monitor/hat.dmi and b/icons/mob/clothing/species/machine/monitor/hat.dmi differ diff --git a/icons/mob/clothing/species/machine/monitor/helmet.dmi b/icons/mob/clothing/species/machine/monitor/helmet.dmi index 7253275fa99..ad33df06aae 100644 Binary files a/icons/mob/clothing/species/machine/monitor/helmet.dmi and b/icons/mob/clothing/species/machine/monitor/helmet.dmi differ diff --git a/icons/mob/clothing/species/machine/monitor/hood.dmi b/icons/mob/clothing/species/machine/monitor/hood.dmi index b59cb87d413..b3d9b342e12 100644 Binary files a/icons/mob/clothing/species/machine/monitor/hood.dmi and b/icons/mob/clothing/species/machine/monitor/hood.dmi differ