Masquerade masks can now be toggled to hide your identity (#1428)

* Masquerade masks can now be toggled to hide your identity * Increases the amount of masquerade masks available from the autodrobe Co-authored-by: GoldenAlpharex <[email protected]>
Fluffy-Frontier · Jan 4, 2024 · 490f279 · 490f279
1 parent 60f16ba
commit 490f279
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/modular_nova/modules/customization/modules/clothing/masks/masquerade_mask.dm b/modular_nova/modules/customization/modules/clothing/masks/masquerade_mask.dm
@@ -7,6 +7,9 @@
 	worn_icon = 'modular_nova/modules/GAGS/icons/mask/masquerade_mask_worn.dmi'
 	flags_1 = IS_PLAYER_COLORABLE_1
 	clothing_flags = MASKINTERNALS
+	up = TRUE
+	visor_flags_inv = HIDEFACE
+	actions_types = list(/datum/action/item_action/toggle)
 	alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER
 	supports_variations_flags = CLOTHING_SNOUTED_VARIATION | CLOTHING_SNOUTED_VOX_VARIATION | CLOTHING_SNOUTED_BETTER_VOX_VARIATION
 	greyscale_colors = "#ececec#333333#9b1e1e"
@@ -17,6 +20,13 @@
 	greyscale_config_worn_vox = /datum/greyscale_config/masquerade_mask/worn/vox
 	greyscale_config_worn_teshari = /datum/greyscale_config/masquerade_mask/worn/teshari
 
+/obj/item/clothing/mask/masquerade/attack_self(mob/user)
+	weldingvisortoggle(user)
+
+/obj/item/clothing/mask/masquerade/visor_toggling()
+	up = !up
+	flags_inv ^= visor_flags_inv
+
 /obj/item/clothing/mask/masquerade/feathered
 	name = "feathered masquerade mask"
 	desc = "You'll never guess who's under that mask, it's the perfect disguise! This one even has a feather, to make it fancier!"

diff --git a/modular_nova/modules/modular_vending/code/autodrobe.dm b/modular_nova/modules/modular_vending/code/autodrobe.dm
@@ -30,10 +30,10 @@
 				/obj/item/clothing/under/costume/skyrat/yukata = 5,
 				/obj/item/clothing/under/costume/skyrat/kimono = 5,
 				/obj/item/clothing/head/beret/badge = 5,
-				/obj/item/clothing/mask/masquerade = 5,
-				/obj/item/clothing/mask/masquerade/two_colors = 5,
-				/obj/item/clothing/mask/masquerade/feathered = 5,
-				/obj/item/clothing/mask/masquerade/two_colors/feathered = 5,
+				/obj/item/clothing/mask/masquerade = 25,
+				/obj/item/clothing/mask/masquerade/two_colors = 25,
+				/obj/item/clothing/mask/masquerade/feathered = 25,
+				/obj/item/clothing/mask/masquerade/two_colors/feathered = 25,
 			),
 		),
 		list(