diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index b588bd8dcd3..1f3681e402c 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -8,6 +8,7 @@ name = "white beanie" desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads." icon_state = "beanie" //Default white + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', ) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 985e46c73bc..aca34e509b8 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,6 +10,10 @@ desc = "It smells faintly of plasma." icon_state = "petehat" +/obj/item/clothing/head/collectable/petehat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/slime name = "collectable slime cap!" desc = "It just latches right in place!" @@ -28,12 +32,20 @@ dog_fashion = /datum/dog_fashion/head/chef sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/collectable/chef/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /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." icon_state = "paper" dog_fashion = /datum/dog_fashion/head +/obj/item/clothing/head/collectable/paper/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/tophat name = "collectable top hat" desc = "A top hat worn by only the most prestigious hat collectors." @@ -41,6 +53,10 @@ dog_fashion = /datum/dog_fashion/head sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/collectable/tophat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" desc = "A Collectable Hat that'll make you look just like a real captain!" @@ -48,10 +64,15 @@ dog_fashion = /datum/dog_fashion/head/captain sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/collectable/captain/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/police name = "collectable police officer's hat" desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW." icon_state = "policehat" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/warden /obj/item/clothing/head/collectable/beret @@ -67,6 +88,7 @@ name = "collectable welding helmet" desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!" icon_state = "welding" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', @@ -78,6 +100,7 @@ /obj/item/clothing/head/collectable/flatcap name = "collectable flat cap" desc = "A Collectable farmer's Flat Cap!" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' icon_state = "flat_cap" /obj/item/clothing/head/collectable/pirate @@ -91,12 +114,14 @@ name = "collectable kitty ears" desc = "The fur feels.....a bit too realistic." icon_state = "kitty" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/kitty /obj/item/clothing/head/collectable/rabbitears name = "collectable rabbit ears" desc = "Not as lucky as the feet!" icon_state = "bunny" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/rabbit /obj/item/clothing/head/collectable/wizard @@ -105,6 +130,10 @@ icon_state = "wizard" dog_fashion = /datum/dog_fashion/head/blue_wizard +/obj/item/clothing/head/collectable/wizard/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/hardhat name = "collectable hard hat" desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!" @@ -116,12 +145,20 @@ desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!" icon_state = "hos_cap" +/obj/item/clothing/head/collectable/hos/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/hop name = "collectable HoP hat" desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!" icon_state = "hopcap" dog_fashion = /datum/dog_fashion/head/hop +/obj/item/clothing/head/collectable/hop/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/collectable/thunderdome name = "collectable Thunderdome helmet" desc = "Go Red! I mean Green! I mean Red! No Green!" diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index dae8cb805b9..642fc0ba3eb 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -15,6 +15,10 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) +/obj/item/clothing/head/chefhat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + //Captain /obj/item/clothing/head/caphat name = "captain's hat" @@ -30,11 +34,19 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) +/obj/item/clothing/head/caphat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/caphat/parade name = "captain's parade cap" desc = "Worn only by Captains with an abundance of class." icon_state = "captain_capblue" +/obj/item/clothing/head/caphat/parade/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/caphat/parade/white icon_state = "captain_capwhite" @@ -51,6 +63,10 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) +/obj/item/clothing/head/hop/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + //Quartermaster /obj/item/clothing/head/qm name = "quartermaster's cap" @@ -254,6 +270,10 @@ strip_delay = 80 dog_fashion = /datum/dog_fashion/head/hos +/obj/item/clothing/head/hos/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /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." @@ -261,10 +281,10 @@ armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 20, ACID = 75) strip_delay = 60 dog_fashion = /datum/dog_fashion/head/warden + 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/officer name = "officer's cap" diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 6c99fc1135e..a6bd9822dce 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -129,12 +129,14 @@ name = "rabbit ears" desc = "Wearing these makes you look useless, and only good for your sex appeal." icon_state = "bunny" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/rabbit /obj/item/clothing/head/flatcap name = "flat cap" desc = "A working man's cap." icon_state = "flat_cap" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/pirate name = "pirate hat" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 66f08148b26..87b555ce6f7 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -25,6 +25,7 @@ actions_types = list(/datum/action/item_action/toggle) visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE resistance_flags = FIRE_PROOF + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', @@ -171,6 +172,7 @@ desc = "A pair of kitty ears. Meow!" icon_state = "kitty" var/icon/mob + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = /datum/dog_fashion/head/kitty /obj/item/clothing/head/kitty/update_icon(updates=ALL, mob/living/carbon/human/user) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index a048efa3f59..2a843ffb967 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -12,6 +12,10 @@ magical = TRUE dog_fashion = /datum/dog_fashion/head/blue_wizard +/obj/item/clothing/head/wizard/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/wizard/red name = "red wizard hat" desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user." @@ -39,11 +43,7 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi' - ) - -/obj/item/clothing/head/wizard/mime/Initialize(mapload) - . = ..() - AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + ) /obj/item/clothing/head/wizard/fake desc = "It has WIZZARD written across it in sequins. Comes with a cool beard." @@ -53,8 +53,13 @@ armor = null magical = FALSE resistance_flags = FLAMMABLE + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi' sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/wizard/fake/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/wizard/marisa name = "witch hat" desc = "Strange-looking hat-wear, makes you want to cast fireballs." @@ -66,14 +71,24 @@ desc = "A mysterious helmet that hums with an unearthly power." icon_state = "magus" dog_fashion = /datum/dog_fashion/head/wizard/magus + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/wizard/magus/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/wizard/amp name = "psychic amplifier" desc = "A crown-of-thorns psychic amplifier. Kind of looks like a tiara having sex with an industrial robot." icon_state = "amp" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' dog_fashion = null +/obj/item/clothing/head/wizard/amp/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/suit/wizrobe name = "wizard robe" desc = "A magnificent, gem-lined robe that seems to radiate power." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 5a88e4c3178..659cf8fec9e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1425,6 +1425,7 @@ name = "strange witch hat" desc = "A shapeshifting witch hat. A strange aura comes from it..." icon = 'icons/obj/custom_items.dmi' + icon_monitor = null icon_state = "classic_witch" /obj/item/clothing/head/wizard/fake/fluff/dreamy/attack_self__legacy__attackchain(mob/user) diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi index e8b1babebe9..0e09a267965 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 6d9f306e56e..7253275fa99 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 25136cf161a..b59cb87d413 100644 Binary files a/icons/mob/clothing/species/machine/monitor/hood.dmi and b/icons/mob/clothing/species/machine/monitor/hood.dmi differ