diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index 0dd9cf6bea..1f7eb4ab8b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -218,8 +218,8 @@ flags_inv = NONE flags_cover = NONE desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, with each flash you lose comprehension of what you are seeing." - item_flags = EXAMINE_SKIP armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + obj_flags = NONE | EXAMINE_SKIP /obj/item/clothing/suit/hooded/cultrobes/void name = "void cloak" @@ -242,9 +242,10 @@ //We need to account for the hood shenanigans, and that way we can make sure items always fit, even if one of the slots is used by the fucking hood. if(suittoggled) to_chat(carbon_user,"The light shifts around you making the cloak invisible!") - else + obj_flags |= EXAMINE_SKIP + else if(obj_flags & EXAMINE_SKIP) // ensures that it won't toggle visibility if raising the hood failed to_chat(carbon_user,"The kaleidoscope of colours collapses around you, as the cloak shifts to visibility!") - item_flags = suittoggled ? EXAMINE_SKIP : ~EXAMINE_SKIP + obj_flags ^= EXAMINE_SKIP else to_chat(carbon_user,"You can't force the hood onto your head!") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 31ab636ceb..aa14fe6013 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -41,10 +41,10 @@ . += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg]." //head - if(head && !(head.item_flags & EXAMINE_SKIP)) + if(head && !(head.obj_flags & EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head." //suit/armor - if(wear_suit && !(wear_suit.item_flags & EXAMINE_SKIP)) + if(wear_suit && !(wear_suit.obj_flags & EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)]." //suit/armor storage if(s_store && !(SLOT_S_STORE in obscured))