diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index dcd26273689..985e46c73bc 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -84,6 +84,7 @@ name = "collectable pirate hat" desc = "You'd make a great Dread Syndie Roberts!" icon_state = "pirate" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/pirate /obj/item/clothing/head/collectable/kitty @@ -125,10 +126,12 @@ name = "collectable Thunderdome helmet" desc = "Go Red! I mean Green! I mean Red! No Green!" icon_state = "thunderdome" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' /obj/item/clothing/head/collectable/swat name = "collectable SWAT helmet" desc = "Now you can be in the Deathsquad too!" icon_state = "swat" inhand_icon_state = "swat_hel" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 48d52315de0..cd5f3cdb6d9 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -13,6 +13,7 @@ max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT strip_delay = 60 dog_fashion = /datum/dog_fashion/head/helmet + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index d9930e58de4..adf11d2c86a 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -74,6 +74,7 @@ desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', @@ -395,6 +396,7 @@ icon_state = "griffinhat" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list("Grey" = 'icons/mob/clothing/species/grey/head.dmi') actions_types = list(/datum/action/item_action/caw) @@ -415,6 +417,7 @@ name = "bloated human head" desc = "A horribly bloated and mismatched human head." icon_state = "lingspacehelmet" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' /obj/item/clothing/head/papersack name = "paper sack hat" diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm index 91b0a1ce584..26ea7771c94 100644 --- a/code/modules/clothing/spacesuits/alien_suits.dm +++ b/code/modules/clothing/spacesuits/alien_suits.dm @@ -3,6 +3,7 @@ name = "skrellian helmet" desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl." species_restricted = list("Skrell","Human") + icon_monitor = null /obj/item/clothing/head/helmet/space/skrell/white icon_state = "skrell_helmet_white" @@ -26,6 +27,7 @@ icon = 'icons/obj/clothing/species/unathi/hats.dmi' icon_state = null species_restricted = list("Unathi") + icon_monitor = null sprite_sheets = list( "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi' ) @@ -66,6 +68,7 @@ armor = list(MELEE = 35, BULLET = 35, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285) icon = 'icons/obj/clothing/species/vox/suits.dmi' icon_state = null + icon_monitor = null species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9d078ed8cd6..75272ac4c6c 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -382,6 +382,7 @@ name = "eagle helmet" desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle." icon_state = "griffinhat" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = null /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon_state() diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm index a53aee02d8f..1fb060681d6 100644 --- a/code/modules/clothing/spacesuits/misc_spacesuits.dm +++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm @@ -70,10 +70,15 @@ icon_state = "beret_soo" inhand_icon_state = null worn_icon = 'icons/mob/clothing/head/beret.dmi' + icon_monitor = null flags = STOPSPRESSUREDMAGE | THICKMATERIAL flags_inv = null sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi') +/obj/item/clothing/head/helmet/space/deathsquad/beret/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov name = "\improper TSF staff officer's beret" desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by high-ranking officers of the Trans-Solar Federation." @@ -138,6 +143,7 @@ flags_cover = HEADCOVERSEYES strip_delay = 40 put_on_delay = 20 + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/suit/space/pirate name = "pirate coat" diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index eb7abd8f4e5..da2289106e2 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -8,6 +8,7 @@ worn_icon = 'icons/mob/clothing/species/plasmaman/helmet.dmi' worn_icon_state = null inhand_icon_state = "plasmaman_helmet" + icon_monitor = null strip_delay = 80 tint = FLASH_PROTECTION_WELDER armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 150) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c11eb49148d..498f14760d8 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -706,6 +706,7 @@ flags = BLOCKHAIR flags_inv = HIDEEYES|HIDEMASK|HIDEFACE|HIDEEARS var/state = "Soldier Up" + icon_monitor = null /obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self__legacy__attackchain(mob/user) if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user)) diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi new file mode 100644 index 00000000000..102f6c1cbe6 Binary files /dev/null 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 new file mode 100644 index 00000000000..6d9f306e56e Binary files /dev/null and b/icons/mob/clothing/species/machine/monitor/helmet.dmi differ