diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 753dd99d41f..9679f8eff1c 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -550,6 +550,10 @@ "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) +/obj/item/clothing/head/flower_crown/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/sunflower_crown name = "sunflower crown" desc = "A bright flower crown made out sunflowers that is sure to brighten up anyone's day!" @@ -560,6 +564,10 @@ "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) +/obj/item/clothing/head/sunflower_crown/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/poppy_crown name = "poppy crown" desc = "A flower crown made out of a string of bright red poppies." @@ -570,10 +578,15 @@ "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) +/obj/item/clothing/head/poppy_crown/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/lily_crown name = "lily crown" desc = "A leafy flower crown with a cluster of large white lilies at the front." icon_state = "lily_crown" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi', @@ -590,11 +603,16 @@ "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) +/obj/item/clothing/head/geranium_crown/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) + /obj/item/clothing/head/cool_bandana name = "badass bandana" desc = "You know what time it is." icon_state = "tmc_hat" inhand_icon_state = "armor" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi', diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index e6c32adcc98..7fc515345e6 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -64,6 +64,10 @@ var/status = 0 var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage +/obj/item/clothing/head/cakehat/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 3) + /obj/item/clothing/head/cakehat/process() if(!onfire) STOP_PROCESSING(SSobj, src) @@ -126,11 +130,13 @@ name = "\improper Soviet officer hat" desc = "A military officer hat designed to stand out so the conscripts know who is in charge." icon_state = "sovietofficerhat" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /obj/item/clothing/head/sovietadmiralhat name = "\improper Soviet admiral hat" desc = "This hat clearly belongs to someone very important." icon_state = "sovietadmiralhat" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' /* * Pumpkin head @@ -200,6 +206,7 @@ name = "mouse ears" desc = "A pair of mouse ears. Squeak!" icon_state = "mousey" + icon_monitor = null /* * Head Mirror @@ -208,6 +215,7 @@ name = "head mirror" desc = "A band of rubber with a very reflective looking mirror attached to the front of it. One of the early signs of medical budget cuts." icon_state = "head_mirror" + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 54679642f43..79a312fae5b 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -6,6 +6,7 @@ worn_icon = 'icons/mob/clothing/head/softcap.dmi' actions_types = list(/datum/action/item_action/flip_cap) dog_fashion = /datum/dog_fashion/head/softcap + icon_monitor = 'icons/mob/clothing/species/machine/monitor/softcap.dmi' sprite_sheets = list( "Kidan" = 'icons/mob/clothing/species/kidan/head/softcap.dmi', "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi' diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 1722538c6d0..430d9e3ae50 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -11,6 +11,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 200, FIRE = 20, ACID = INFINITY) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES resistance_flags = ACID_PROOF + icon_monitor = 'icons/mob/clothing/species/machine/monitor/bio.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/bio.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/head/bio.dmi', diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 30eeb010dbe..0cffaff94d1 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -927,6 +927,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 50) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES + icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi' //Basic jacket and subtypes /obj/item/clothing/suit/sec_greatcoat diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 506eb9da270..305c8086e01 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -73,6 +73,7 @@ strip_delay = 70 put_on_delay = 70 resistance_flags = NONE + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi' @@ -123,6 +124,7 @@ put_on_delay = 60 resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 + icon_monitor = 'icons/mob/clothing/species/machine/monitor/helmet.dmi' sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi', diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm index 03e89a6ad7f..0baafb4b23f 100644 --- a/code/modules/holiday/christmas.dm +++ b/code/modules/holiday/christmas.dm @@ -67,3 +67,7 @@ icon_state = "xmashat" desc = "A crappy paper hat that you are REQUIRED to wear." flags_inv = 0 + +/obj/item/clothing/head/festive/Initialize(mapload) + . = ..() + AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) diff --git a/icons/mob/clothing/species/machine/monitor/bio.dmi b/icons/mob/clothing/species/machine/monitor/bio.dmi new file mode 100644 index 00000000000..648bf424156 Binary files /dev/null and b/icons/mob/clothing/species/machine/monitor/bio.dmi differ diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi index 882522189c6..f51ce0c03a8 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 6df9eedf776..1e704406537 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 b3d9b342e12..32dcf07a005 100644 Binary files a/icons/mob/clothing/species/machine/monitor/hood.dmi and b/icons/mob/clothing/species/machine/monitor/hood.dmi differ diff --git a/icons/mob/clothing/species/machine/monitor/softcap.dmi b/icons/mob/clothing/species/machine/monitor/softcap.dmi new file mode 100644 index 00000000000..449a8f29d5c Binary files /dev/null and b/icons/mob/clothing/species/machine/monitor/softcap.dmi differ