diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index ce340def535..750302a7b1b 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -415,6 +415,10 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) +/obj/item/nullrod/fedora/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/nullrod/armblade name = "dark blessing" desc = "Particularly twisted deities grant gifts of dubious value." diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index f605047733c..753dd99d41f 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -158,6 +158,7 @@ name = "pirate bandana" desc = "Yarr." icon_state = "bandana" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') //stylish bs12 hats @@ -167,21 +168,24 @@ desc = "For that industrial age look." icon_state = "bowler_hat" dog_fashion = /datum/dog_fashion/head/bowlerhat + 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/beaverhat name = "beaver hat" desc = "Like a top hat, but made of beavers." icon_state = "beaver_hat" + 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/boaterhat name = "boater hat" desc = "Goes well with celery." icon_state = "boater_hat" + 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/cowboyhat name = "cowboy hat" @@ -191,7 +195,11 @@ "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/cowboyhat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) /obj/item/clothing/head/cowboyhat/tan name = "tan cowboy hat" @@ -233,6 +241,10 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) +/obj/item/clothing/head/fedora/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/fedora/attack_self__legacy__attackchain(mob/user) tip_fedora(user) @@ -257,6 +269,10 @@ icon_state = "fez" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/fez/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 2) + //end bs12 hats /obj/item/clothing/head/witchwig @@ -266,12 +282,17 @@ flags = BLOCKHAIR sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/witchwig/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/chicken name = "chicken suit head" desc = "Bkaw!" icon_state = "chickenhead" inhand_icon_state = "chickensuit" flags = BLOCKHAIR + 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/corgi @@ -281,10 +302,18 @@ inhand_icon_state = "chickensuit" flags = BLOCKHAIR +/obj/item/clothing/head/corgi/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/corgi/en name = "E-N suit head" icon_state = "enhead" +/obj/item/clothing/head/corgi/en/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/corgi/super_hero name = "super-hero corgi suit head" desc = "Woof! This one seems to pulse with a strange power" @@ -294,6 +323,10 @@ name = "E-N suit head" icon_state = "enhead" +/obj/item/clothing/head/corgi/super_hero/en/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/bearpelt name = "space bear pelt hat" desc = "Fuzzy." @@ -321,6 +354,10 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE +/obj/item/clothing/head/xenos/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /// Why do these exist - Because they aren't specifically Nazi Germany /obj/item/clothing/head/stalhelm name = "clown stalhelm" @@ -328,6 +365,7 @@ icon_state = "stalhelm" flags = BLOCKHAIR flags_inv = HIDEEARS + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' /obj/item/clothing/head/foragecap name = "clown HONKMech cap" @@ -335,12 +373,17 @@ icon_state = "foragecap" flags = BLOCKHAIR +/obj/item/clothing/head/foragecap/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/armyofficer name = "clown officer cap" desc = "The peaked clown officer's cap." icon_state = "armyofficer" flags = BLOCKHAIR flags_inv = HIDEEARS + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /// Fluff? /obj/item/clothing/head/beret/purple @@ -356,6 +399,10 @@ dog_fashion = /datum/dog_fashion/head/sombrero sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/sombrero/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/sombrero/green name = "green sombrero" desc = "As elegant as a dancing cactus." @@ -386,7 +433,7 @@ name = "jester hat" desc = "A hat with bells, to add some merryness to the suit." icon_state = "jester_hat" - + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) @@ -396,6 +443,10 @@ desc = "Welcome to the rice fields, motherfucker." icon_state = "rice_hat" +/obj/item/clothing/head/rice_hat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) @@ -456,22 +507,39 @@ resistance_flags = FIRE_PROOF can_be_hat = FALSE +/obj/item/clothing/head/crown/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/crown/fancy name = "magnificent crown" desc = "A crown worn by only the highest emperors of the land." icon_state = "fancycrown" +/obj/item/clothing/head/crown/fancy/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 2) + /obj/item/clothing/head/zepelli name = "chequered diamond hat" desc = "Wearing this makes you feel like a real mozzarella cheeseball. " icon_state = "zepelli" +/obj/item/clothing/head/zepelli/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/cuban_hat name = "rhumba hat" desc = "Now just to find some maracas!" icon_state = "cuban_hat" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/head/cuban_hat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/flower_crown name = "flower crown" desc = "A colorful flower crown made out of lilies, sunflowers and poppies." diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi index 605e6efdfea..882522189c6 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 ad33df06aae..6df9eedf776 100644 Binary files a/icons/mob/clothing/species/machine/monitor/helmet.dmi and b/icons/mob/clothing/species/machine/monitor/helmet.dmi differ