From a44c3cda421ebe1471aa7ec32fe063de924ebb47 Mon Sep 17 00:00:00 2001 From: Bm0n <92271472+Bm0n@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:54:51 -0500 Subject: [PATCH] Fixes HIDEJUMPSUIT and HIDEGLOVES invis flags Edit: Now with HIDEEARS!!! (#27232) * fix * HIDEEYES --------- Co-authored-by: Bmon --- .../changeling/powers/mutations.dm | 2 +- code/modules/clothing/head/misc_special.dm | 2 +- code/modules/clothing/suits/armor_suits.dm | 6 +- code/modules/clothing/suits/job_suits.dm | 2 +- code/modules/clothing/suits/misc_suits.dm | 3 +- .../living/carbon/human/human_inventory.dm | 14 ++ .../living/carbon/human/human_update_icons.dm | 124 ++++++++++-------- code/modules/mod/mod_theme.dm | 54 ++++---- 8 files changed, 113 insertions(+), 94 deletions(-) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index e46251f852f..146cabfa1a4 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -517,7 +517,7 @@ flags = NODROP | DROPDEL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 20, BOMB = 10, RAD = 0, FIRE = 90, ACID = 90) - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT | HIDESHOES cold_protection = 0 heat_protection = 0 sprite_sheets = null diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 41b8cd5ea05..35c40863d25 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -24,7 +24,7 @@ armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 75) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) actions_types = list(/datum/action/item_action/toggle) - visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE resistance_flags = FIRE_PROOF sprite_sheets = list( diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index 94c41cd423f..1657f320aa6 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -229,7 +229,6 @@ icon_state = "captain_jacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS armor = list(MELEE = 40, BULLET = 20, LASER = 25, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450) - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic name = "captain's tunic" @@ -264,7 +263,6 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(MELEE = 50, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 200, ACID = 200) - flags_inv = HIDEJUMPSUIT strip_delay = 80 put_on_delay = 60 sprite_sheets = list( @@ -726,13 +724,13 @@ flags_2 = RAD_PROTECT_CONTENTS_2 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 3 - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDEJUMPSUIT hide_tail_by_species = list("Vox") /obj/item/clothing/suit/armor/tdome armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = 450, ACID = 450) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDEJUMPSUIT flags = THICKMATERIAL flags_2 = RAD_PROTECT_CONTENTS_2 cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index f18c22133f2..351ba06560f 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -72,7 +72,7 @@ icon_state = "monkrobe" item_state = "monkrobe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS - flags_inv = HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT hoodtype = /obj/item/clothing/head/hooded/monk_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index befeb45c78d..2a484557e8f 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -67,7 +67,6 @@ desc = "Yarr." icon_state = "hgpirate" item_state = "hgpirate" - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/cyborg_suit @@ -149,7 +148,7 @@ icon_state = "hastur" item_state = "hastur" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/imperium_monk diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm index b9ca980f82e..e0c55359133 100644 --- a/code/modules/mob/living/carbon/human/human_inventory.dm +++ b/code/modules/mob/living/carbon/human/human_inventory.dm @@ -79,6 +79,8 @@ update_inv_w_uniform() if(I.flags_inv & HIDESHOES) update_inv_shoes() + if(I.flags_inv & HIDEGLOVES) + update_inv_gloves() update_inv_wear_suit() else if(I == w_uniform) if(r_store) @@ -116,6 +118,8 @@ var/obj/item/clothing/head/hat = I if(hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha)) update_sight() + if(I.flags_inv & HIDEEARS) + update_inv_ears() head_update(I) update_inv_head() update_misc_effects() @@ -139,6 +143,8 @@ update_head_accessory() if(internal && !get_organ_slot("breathing_tube")) internal = null + if(I.flags_inv & HIDEEARS) + update_inv_ears() wear_mask_update(I, toggle_off = FALSE) sec_hud_set_ID() update_misc_effects() @@ -211,6 +217,8 @@ update_head_accessory() if(length(hud_list)) sec_hud_set_ID() + if(wear_mask.flags_inv & HIDEEARS) + update_inv_ears() wear_mask_update(I, toggle_off = TRUE) update_misc_effects() update_inv_wear_mask() @@ -281,6 +289,8 @@ if(hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha)) update_sight() // this calls update_inv_head() on its own + if(head.flags_inv & HIDEEARS) + update_inv_ears() update_misc_effects() head_update(I) if(ITEM_SLOT_SHOES) @@ -288,8 +298,12 @@ update_inv_shoes() if(ITEM_SLOT_OUTER_SUIT) wear_suit = I + if(wear_suit.flags_inv & HIDEJUMPSUIT) + update_inv_w_uniform() if(wear_suit.flags_inv & HIDESHOES) update_inv_shoes() + if(wear_suit.flags_inv & HIDEGLOVES) + update_inv_gloves() update_inv_wear_suit() if(ITEM_SLOT_JUMPSUIT) w_uniform = I diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index a50446542ff..3916da7ae5d 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -581,38 +581,40 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(w_uniform && istype(w_uniform, /obj/item/clothing/under)) update_hud_uniform(w_uniform) - var/t_color = w_uniform.item_color - if(!t_color) - t_color = icon_state + if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT)) - var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/under/misc.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) + var/t_color = w_uniform.item_color + if(!t_color) + t_color = icon_state - if(w_uniform.icon_override) - standing.icon = w_uniform.icon_override - if(w_uniform.sprite_sheets) - standing.icon = w_uniform.sprite_sheets["Human"] - if(w_uniform.sprite_sheets[dna.species.sprite_sheet_name] && icon_exists(w_uniform.sprite_sheets[dna.species.sprite_sheet_name], "[t_color]_s")) - standing.icon = w_uniform.sprite_sheets[dna.species.sprite_sheet_name] + var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/under/misc.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) - if(w_uniform.blood_DNA) - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "uniformblood") - bloodsies.color = w_uniform.blood_color - standing.overlays += bloodsies + if(w_uniform.icon_override) + standing.icon = w_uniform.icon_override + if(w_uniform.sprite_sheets) + standing.icon = w_uniform.sprite_sheets["Human"] + if(w_uniform.sprite_sheets[dna.species.sprite_sheet_name] && icon_exists(w_uniform.sprite_sheets[dna.species.sprite_sheet_name], "[t_color]_s")) + standing.icon = w_uniform.sprite_sheets[dna.species.sprite_sheet_name] - if(length(w_uniform.accessories)) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: - for(var/obj/item/clothing/accessory/A in w_uniform:accessories) - var/tie_color = A.item_color - if(!tie_color) - tie_color = A.icon_state - if(A.icon_override) - standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]") - else if(A.sprite_sheets && A.sprite_sheets[dna.species.sprite_sheet_name]) - standing.overlays += image("icon" = A.sprite_sheets[dna.species.sprite_sheet_name], "icon_state" = "[A.icon_state]") - else - standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") - standing.alpha = w_uniform.alpha - standing.color = w_uniform.color - overlays_standing[UNIFORM_LAYER] = standing + if(w_uniform.blood_DNA) + var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "uniformblood") + bloodsies.color = w_uniform.blood_color + standing.overlays += bloodsies + + if(length(w_uniform.accessories)) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: + for(var/obj/item/clothing/accessory/A in w_uniform:accessories) + var/tie_color = A.item_color + if(!tie_color) + tie_color = A.icon_state + if(A.icon_override) + standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]") + else if(A.sprite_sheets && A.sprite_sheets[dna.species.sprite_sheet_name]) + standing.overlays += image("icon" = A.sprite_sheets[dna.species.sprite_sheet_name], "icon_state" = "[A.icon_state]") + else + standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") + standing.alpha = w_uniform.alpha + standing.color = w_uniform.color + overlays_standing[UNIFORM_LAYER] = standing else if(!dna.species.nojumpsuit) var/list/uniform_slots = list() @@ -671,22 +673,24 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(gloves) update_hud_gloves(gloves) - var/t_state = gloves.item_state - if(!t_state) t_state = gloves.icon_state + if(!wear_suit || !(wear_suit.flags_inv & HIDEGLOVES)) - var/mutable_appearance/standing - if(gloves.icon_override) - standing = mutable_appearance(gloves.icon_override, "[gloves.icon_state]", layer = -GLOVES_LAYER) - else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.sprite_sheet_name]) - standing = mutable_appearance(gloves.sprite_sheets[dna.species.sprite_sheet_name], "[t_state]", layer = -GLOVES_LAYER) - else - standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + var/t_state = gloves.item_state + if(!t_state) t_state = gloves.icon_state - if(gloves.blood_DNA) // No need to check for hands here because we won't have gloves on. - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") - bloodsies.color = gloves.blood_color - standing.overlays += bloodsies - overlays_standing[GLOVES_LAYER] = standing + var/mutable_appearance/standing + if(gloves.icon_override) + standing = mutable_appearance(gloves.icon_override, "[gloves.icon_state]", layer = -GLOVES_LAYER) + else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.sprite_sheet_name]) + standing = mutable_appearance(gloves.sprite_sheets[dna.species.sprite_sheet_name], "[t_state]", layer = -GLOVES_LAYER) + else + standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + + if(gloves.blood_DNA) // No need to check for hands here because we won't have gloves on. + var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") + bloodsies.color = gloves.blood_color + standing.overlays += bloodsies + overlays_standing[GLOVES_LAYER] = standing else if(blood_DNA) // Checks for hands to make sure we don't get mysterious floating blood. if(get_organ("l_hand")) @@ -755,28 +759,32 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(l_ear) update_hud_l_ear(l_ear) - var/left_ear_item_state = l_ear.item_state ? l_ear.item_state : l_ear.icon_state - var/left_ear_icon = 'icons/mob/clothing/ears.dmi' - if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.sprite_sheet_name]) - left_ear_icon = l_ear.sprite_sheets[dna.species.sprite_sheet_name] - if(l_ear.icon_override) - left_ear_item_state = "[left_ear_item_state]_l" - left_ear_icon = l_ear.icon_override + if((!head || !(head.flags_inv & HIDEEARS)) && (!wear_mask || !(wear_mask.flags_inv & HIDEEARS))) - overlays_standing[LEFT_EAR_LAYER] = mutable_appearance(left_ear_icon, left_ear_item_state, layer = -LEFT_EAR_LAYER) + var/left_ear_item_state = l_ear.item_state ? l_ear.item_state : l_ear.icon_state + var/left_ear_icon = 'icons/mob/clothing/ears.dmi' + if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.sprite_sheet_name]) + left_ear_icon = l_ear.sprite_sheets[dna.species.sprite_sheet_name] + if(l_ear.icon_override) + left_ear_item_state = "[left_ear_item_state]_l" + left_ear_icon = l_ear.icon_override + + overlays_standing[LEFT_EAR_LAYER] = mutable_appearance(left_ear_icon, left_ear_item_state, layer = -LEFT_EAR_LAYER) if(r_ear) update_hud_r_ear(r_ear) - var/right_ear_item_state = r_ear.item_state ? r_ear.item_state : r_ear.icon_state - var/right_ear_icon = 'icons/mob/clothing/ears.dmi' - if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.sprite_sheet_name]) - right_ear_icon = r_ear.sprite_sheets[dna.species.sprite_sheet_name] - if(r_ear.icon_override) - right_ear_icon = "[right_ear_item_state]_l" - right_ear_icon = r_ear.icon_override + if((!head || !(head.flags_inv & HIDEEARS)) && (!wear_mask || !(wear_mask.flags_inv & HIDEEARS))) - overlays_standing[RIGHT_EAR_LAYER] = mutable_appearance(right_ear_icon, right_ear_item_state, layer = -RIGHT_EAR_LAYER) + var/right_ear_item_state = r_ear.item_state ? r_ear.item_state : r_ear.icon_state + var/right_ear_icon = 'icons/mob/clothing/ears.dmi' + if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.sprite_sheet_name]) + right_ear_icon = r_ear.sprite_sheets[dna.species.sprite_sheet_name] + if(r_ear.icon_override) + right_ear_icon = "[right_ear_item_state]_l" + right_ear_icon = r_ear.icon_override + + overlays_standing[RIGHT_EAR_LAYER] = mutable_appearance(right_ear_icon, right_ear_item_state, layer = -RIGHT_EAR_LAYER) apply_overlay(LEFT_EAR_LAYER) apply_overlay(RIGHT_EAR_LAYER) diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 5ae0066c1d8..a78287e26c0 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -58,7 +58,7 @@ UNSEALED_LAYER = COLLAR_LAYER, SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -82,7 +82,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS |HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -140,7 +140,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -194,7 +194,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -256,7 +256,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -316,7 +316,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -341,7 +341,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -390,7 +390,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -444,7 +444,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -469,7 +469,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -531,7 +531,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -587,7 +587,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -642,7 +642,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -698,7 +698,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -753,7 +753,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -810,7 +810,7 @@ UNSEALED_LAYER = COLLAR_LAYER, SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -860,7 +860,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -920,7 +920,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -945,7 +945,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1008,7 +1008,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1067,7 +1067,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1125,7 +1125,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1149,7 +1149,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1209,7 +1209,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1264,7 +1264,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1311,7 +1311,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -1360,7 +1360,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list(