diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 66d4b46c60..15a5345ad1 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,12 +11,25 @@ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH resistance_flags = NONE mutantrace_variation = STYLE_MUZZLE + visor_flags_inv = HIDEFACE + var/flavor_adjust = TRUE //can it do the heehoo alt click to hide/show identity + +/obj/item/clothing/mask/gas/examine(mob/user) + . = ..() + if(flavor_adjust) + . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]." + +/obj/item/clothing/mask/gas/AltClick(mob/user) + . = ..() + if(flavor_adjust && adjustmask(user, TRUE)) + return TRUE /obj/item/clothing/mask/gas/glass name = "glass gas mask" desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." //More accurate icon_state = "gas_clear" flags_inv = HIDEEYES + flavor_adjust = FALSE // **** Welding gas mask **** @@ -35,6 +48,7 @@ visor_flags_inv = HIDEEYES visor_flags_cover = MASKCOVERSEYES resistance_flags = FIRE_PROOF + flavor_adjust = FALSE /obj/item/clothing/mask/gas/welding/attack_self(mob/user) weldingvisortoggle(user) @@ -72,7 +86,6 @@ flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) - visor_flags_inv = HIDEFACE dog_fashion = /datum/dog_fashion/head/clown var/static/list/clownmask_designs @@ -87,15 +100,6 @@ "The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow") ) -/obj/item/clothing/mask/gas/clown_hat/examine(mob/user) - . = ..() - . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]." - -/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/user) - . = ..() - if(adjustmask(user, TRUE)) - return TRUE - /obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user) if(!istype(user) || user.incapacitated()) return @@ -130,18 +134,8 @@ flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) - visor_flags_inv = HIDEFACE var/static/list/mimemask_designs -/obj/item/clothing/mask/gas/mime/examine(mob/user) - . = ..() - . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]." - -/obj/item/clothing/mask/gas/mime/AltClick(mob/user) - . = ..() - if(adjustmask(user, TRUE)) - return TRUE - /obj/item/clothing/mask/gas/mime/Initialize(mapload) .=..() if(!mimemask_designs)