From e8c2b7d2a65817710f27dde724b3524d7f90aed2 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 26 Nov 2020 01:03:00 +0000
Subject: [PATCH] gas mask adjusting
---
code/modules/clothing/masks/gasmask.dm | 33 ++++++++++----------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 66d4b46c60..a7ae47558d 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,6 +11,18 @@
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"
@@ -35,6 +47,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 +85,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 +99,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 +133,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)