mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.

code/controllers/subsystem/traumas.dm

@@ -158,8 +158,8 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
 						/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
-						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
-						/obj/item/clothing/under/rank/civilian/mime/sexy, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
+						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret,
+						/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
 
 					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),

code/datums/action.dm

@@ -273,6 +273,13 @@
 	if(istype(H))
 		H.toggle_welding_screen(owner)
 
+/datum/action/item_action/toggle_welding_screen/plasmaman
+
+/datum/action/item_action/toggle_welding_screen/plasmaman/Trigger()
+	var/obj/item/clothing/head/helmet/space/plasmaman/H = target
+	if(istype(H))
+		H.toggle_welding_screen(owner)
+
 /datum/action/item_action/toggle_headphones
 	name = "Toggle Headphones"
 	desc = "UNTZ UNTZ UNTZ"

code/game/objects/effects/spawners/bundle.dm

@@ -160,13 +160,13 @@
 /obj/effect/spawner/bundle/costume/sexyclown
 	name = "sexy clown costume spawner"
 	items = list(
-		/obj/item/clothing/mask/gas/sexyclown,
+		/obj/item/clothing/mask/gas/clown_hat/sexy,
 		/obj/item/clothing/under/rank/civilian/clown/sexy)
 
 /obj/effect/spawner/bundle/costume/sexymime
 	name = "sexy mime costume spawner"
 	items = list(
-		/obj/item/clothing/mask/gas/sexymime,
+		/obj/item/clothing/mask/gas/mime/sexy,
 		/obj/item/clothing/under/rank/civilian/mime/sexy)
 
 /obj/effect/spawner/bundle/crate/Initialize(mapload)

code/modules/clothing/masks/_masks.dm

@@ -44,30 +44,38 @@
 		var/mob/M = loc
 		M.update_inv_wear_mask()
 
-//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
-/obj/item/clothing/mask/proc/adjustmask(mob/living/user)
+/**
+  * Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
+  * The flavor_details variable is for masks that use this function only to toggle HIDEFACE for identity.
+  */
+/obj/item/clothing/mask/proc/adjustmask(mob/living/user, just_flavor = FALSE)
 	if(user && user.incapacitated())
-		return
+		return FALSE
 	mask_adjusted = !mask_adjusted
 	if(!mask_adjusted)
-		src.icon_state = initial(icon_state)
-		gas_transfer_coefficient = initial(gas_transfer_coefficient)
-		permeability_coefficient = initial(permeability_coefficient)
-		clothing_flags |= visor_flags
+		if(!just_flavor)
+			src.icon_state = initial(icon_state)
+			gas_transfer_coefficient = initial(gas_transfer_coefficient)
+			permeability_coefficient = initial(permeability_coefficient)
+			slot_flags = initial(slot_flags)
+			flags_cover |= visor_flags_cover
+			clothing_flags |= visor_flags
 		flags_inv |= visor_flags_inv
-		flags_cover |= visor_flags_cover
-		to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
-		slot_flags = initial(slot_flags)
 	else
-		icon_state += "_up"
-		to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
-		gas_transfer_coefficient = null
-		permeability_coefficient = null
-		clothing_flags &= ~visor_flags
+		if(!just_flavor)
+			icon_state += "_up"
+			gas_transfer_coefficient = null
+			permeability_coefficient = null
+			clothing_flags &= ~visor_flags
+			flags_cover &= ~visor_flags_cover
+			if(adjusted_flags)
+				slot_flags = adjusted_flags
 		flags_inv &= ~visor_flags_inv
-		flags_cover &= ~visor_flags_cover
-		if(adjusted_flags)
-			slot_flags = adjusted_flags
 	if(user)
-		user.wear_mask_update(src, toggle_off = mask_adjusted)
-		user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
+		if(!just_flavor)
+			to_chat(user, "<span class='notice'>You push \the [src] [mask_adjusted ? "out of the way" : "back into place"].</span>")
+			user.wear_mask_update(src, toggle_off = mask_adjusted)
+			user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
+		else
+			to_chat(usr, "<span class='notice'>You adjust [src], it will now [mask_adjusted ? "not" : ""] obscure your identity while worn.</span>")
+	return TRUE

code/modules/clothing/masks/gasmask.dm

@@ -72,18 +72,29 @@
 	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/list/clownmask_designs = list()
+	var/static/list/clownmask_designs = list()
 
 /obj/item/clothing/mask/gas/clown_hat/Initialize(mapload)
 	.=..()
-	clownmask_designs = list(
-		"True Form" = image(icon = src.icon, icon_state = "clown"),
-		"The Feminist" = image(icon = src.icon, icon_state = "sexyclown"),
-		"The Jester" = image(icon = src.icon, icon_state = "chaos"),
-		"The Madman" = image(icon = src.icon, icon_state = "joker"),
-		"The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow")
-		)
+	if(!clownmask_designs)
+		clownmask_designs = list(
+			"True Form" = image(icon = src.icon, icon_state = "clown"),
+			"The Feminist" = image(icon = src.icon, icon_state = "sexyclown"),
+			"The Jester" = image(icon = src.icon, icon_state = "chaos"),
+			"The Madman" = image(icon = src.icon, icon_state = "joker"),
+			"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 <b>[flags_inv & HIDEFACE ? "on" : "off"]</b>."
+
+/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())
@@ -103,14 +114,12 @@
 		to_chat(user, "<span class='notice'>Your Clown Mask has now morphed into [choice], all praise the Honkmother!</span>")
 		return TRUE
 
-/obj/item/clothing/mask/gas/sexyclown
+/obj/item/clothing/mask/gas/clown_hat/sexy
 	name = "sexy-clown wig and mask"
 	desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
-	clothing_flags = ALLOWINTERNALS
 	icon_state = "sexyclown"
 	item_state = "sexyclown"
-	flags_cover = MASKCOVERSEYES
-	resistance_flags = FLAMMABLE
+	actions_types = list()
 
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
@@ -121,18 +130,27 @@
 	flags_cover = MASKCOVERSEYES
 	resistance_flags = FLAMMABLE
 	actions_types = list(/datum/action/item_action/adjust)
-	var/list/mimemask_designs = list()
+	visor_flags_inv = HIDEFACE
+	var/static/list/mimemask_designs = list()
 
+/obj/item/clothing/mask/gas/mime/examine(mob/user)
+	. = ..()
+	. += "Alt-click to toggle identity concealment. it's currently <b>[flags_inv & HIDEFACE ? "on" : "off"]</b>."
+
+/obj/item/clothing/mask/gas/mime/AltClick(mob/user)
+	. = ..()
+	if(adjustmask(user, TRUE))
+		return TRUE
 
 /obj/item/clothing/mask/gas/mime/Initialize(mapload)
 	.=..()
-	mimemask_designs = list(
-		"Blanc" = image(icon = src.icon, icon_state = "mime"),
-		"Excité" = image(icon = src.icon, icon_state = "sexymime"),
-		"Triste" = image(icon = src.icon, icon_state = "sadmime"),
-		"Effrayé" = image(icon = src.icon, icon_state = "scaredmime")
-		)
-
+	if(!mimemask_designs)
+		mimemask_designs = list(
+			"Blanc" = image(icon = src.icon, icon_state = "mime"),
+			"Excité" = image(icon = src.icon, icon_state = "sexymime"),
+			"Triste" = image(icon = src.icon, icon_state = "sadmime"),
+			"Effrayé" = image(icon = src.icon, icon_state = "scaredmime")
+			)
 
 /obj/item/clothing/mask/gas/mime/ui_action_click(mob/user)
 	if(!istype(user) || user.incapacitated())
@@ -151,6 +169,13 @@
 		to_chat(user, "<span class='notice'>Your Mime Mask has now morphed into [choice]!</span>")
 		return TRUE
 
+/obj/item/clothing/mask/gas/mime/sexy
+	name = "sexy mime mask"
+	desc = "A traditional female mime's mask."
+	icon_state = "sexymime"
+	item_state = "sexymime"
+	actions_types = list()
+
 /obj/item/clothing/mask/gas/monkeymask
 	name = "monkey mask"
 	desc = "A mask used when acting as a monkey."
@@ -160,15 +185,6 @@
 	flags_cover = MASKCOVERSEYES
 	resistance_flags = FLAMMABLE
 
-/obj/item/clothing/mask/gas/sexymime
-	name = "sexy mime mask"
-	desc = "A traditional female mime's mask."
-	clothing_flags = ALLOWINTERNALS
-	icon_state = "sexymime"
-	item_state = "sexymime"
-	flags_cover = MASKCOVERSEYES
-	resistance_flags = FLAMMABLE
-
 /obj/item/clothing/mask/gas/death_commando
 	name = "Death Commando Mask"
 	icon_state = "death_commando_mask"

code/modules/clothing/spacesuits/plasmamen.dm

@@ -40,37 +40,115 @@
 	icon_state = "plasmaman-helm"
 	item_state = "plasmaman-helm"
 	strip_delay = 80
+	flash_protect = 2
+	tint = 2
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10)
 	resistance_flags = FIRE_PROOF
 	var/brightness_on = 4 //luminosity when the light is on
-	var/on = FALSE
+	var/helmet_on = FALSE
+	var/smile = FALSE
+	var/smile_color = "#FF0000"
 	var/light_overlay = "envirohelm-light"
-	actions_types = list(/datum/action/item_action/toggle_helmet_light)
+	var/visor_icon = "envisor"
+	var/smile_state = "envirohelm_smile"
+	actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman)
+	visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
+	visor_flags_inv = HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	mutantrace_variation = NONE
 
+/obj/item/clothing/head/helmet/space/plasmaman/Initialize()
+	. = ..()
+	visor_toggling()
+	update_icon()
+
+/obj/item/clothing/head/helmet/space/plasmaman/ComponentInitialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, .proc/wipe_that_smile_off_your_face)
+	AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/clothing/head/helmet/space/plasmaman/AltClick(mob/user)
+	. = ..()
+	if(user.canUseTopic(src, BE_CLOSE))
+		toggle_welding_screen(user)
+		return TRUE
+
+/obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_welding_screen(mob/living/user)
+	if(weldingvisortoggle(user))
+		if(helmet_on)
+			to_chat(user, "<span class='notice'>Your helmet's torch can't pass through your welding visor!</span>")
+			helmet_on = FALSE
+			set_light(0)
+		playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
+		update_icon()
+
+/obj/item/clothing/head/helmet/space/plasmaman/update_overlays()
+	. = ..()
+	if(!up)
+		. += visor_icon
+	if(helmet_on)
+		. += light_overlay
+	if(smile)
+		var/mutable_appearance/M = mutable_appearance(icon, smile_state)
+		M.color = smile_color
+		. += M
+
+/obj/item/clothing/head/helmet/space/plasmaman/attackby(obj/item/C, mob/living/user)
+	. = ..()
+	if(istype(C, /obj/item/toy/crayon))
+		if(!smile)
+			var/obj/item/toy/crayon/CR = C
+			to_chat(user, "<span class='notice'>You start drawing a smiley face on the helmet's visor..</span>")
+			if(do_after(user, 25, target = src))
+				smile = TRUE
+				smile_color = CR.paint_color
+				to_chat(user, "You draw a smiley on the helmet visor.")
+				update_icon()
+		else
+			to_chat(user, "<span class='warning'>Seems like someone already drew something on this helmet's visor!</span>")
+
+///gets called when receiving the CLEAN_ACT signal from something, i.e soap or a shower. exists to remove any smiley faces drawn on the helmet.
+/obj/item/clothing/head/helmet/space/plasmaman/proc/wipe_that_smile_off_your_face()
+	if(smile)
+		smile = FALSE
+		update_icon()
+
 /obj/item/clothing/head/helmet/space/plasmaman/attack_self(mob/user)
 	if(!light_overlay)
 		return
-	on = !on
-	if(!on)
-		cut_overlay(light_overlay)
-	else
-		add_overlay(light_overlay)
-	user.update_inv_head() //So the mob overlay updates
+	if(!up)
+		to_chat(user, "<span class='notice'>Your helmet's torch can't pass through your welding visor!</span>")
+		return
+	helmet_on = !helmet_on
 
-	if(on)
+	if(helmet_on)
 		set_light(brightness_on, 0.8, "#FFCC66")
 	else
 		set_light(0)
 
-	for(var/X in actions)
-		var/datum/action/A=X
-		A.UpdateButtonIcon()
+	update_icon()
+
+/obj/item/clothing/head/helmet/space/plasmaman/visor_toggling() //handles all the actual toggling of flags
+	up = !up
+	clothing_flags ^= visor_flags
+	flags_inv ^= visor_flags_inv
+	if(visor_vars_to_toggle & VISOR_FLASHPROTECT)
+		flash_protect ^= initial(flash_protect)
+	if(visor_vars_to_toggle & VISOR_TINT)
+		tint ^= initial(tint)
 
 /obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
 	. = ..()
-	if(!isinhands && on)
-		. += mutable_appearance(icon_file, light_overlay)
+	if(!isinhands)
+		if(smile)
+			var/mutable_appearance/M = mutable_appearance(icon_file, smile_state)
+			M.color = smile_color
+			. += M
+		if(!up)
+			. += mutable_appearance(icon_file, visor_icon)
+		if(helmet_on)
+			. += mutable_appearance(icon_file, light_overlay)
 
 /obj/item/clothing/head/helmet/space/plasmaman/security
 	name = "security plasma envirosuit helmet"
@@ -170,6 +248,7 @@
 	desc = "A khaki helmet given to plasmamen miners operating on lavaland."
 	icon_state = "explorer_envirohelm"
 	item_state = "explorer_envirohelm"
+	visor_icon = "explorer_envisor"
 
 /obj/item/clothing/head/helmet/space/plasmaman/chaplain
 	name = "chaplain's plasma envirosuit helmet"
@@ -202,7 +281,9 @@
 	icon_state = "prototype_envirohelm"
 	item_state = "prototype_envirohelm"
 	light_overlay = null
-	actions_types = list()
+	actions_types = list(/datum/action/item_action/toggle_welding_screen/plasmaman)
+	smile_state = "prototype_smile"
+	visor_icon = "prototype_envisor"
 
 /obj/item/clothing/head/helmet/space/plasmaman/botany
 	name = "botany plasma envirosuit helmet"
@@ -222,6 +303,7 @@
 	icon_state = "mime_envirohelm"
 	item_state = "mime_envirohelm"
 	light_overlay = "mime_envirohelm-light"
+	visor_icon = "mime_envisor"
 
 /obj/item/clothing/head/helmet/space/plasmaman/clown
 	name = "clown envirosuit helmet"
@@ -229,3 +311,6 @@
 	icon_state = "clown_envirohelm"
 	item_state = "clown_envirohelm"
 	light_overlay = "clown_envirohelm-light"
+	item_state = "clown_envirohelm"
+	visor_icon = "clown_envisor"
+	smile_state = "clown_smile"

code/modules/vending/autodrobe.dm

@@ -74,9 +74,9 @@
 						/obj/item/staff = 3,
 						/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
 						/obj/item/clothing/under/rank/captain/suit/skirt = 1,
-						/obj/item/clothing/mask/gas/sexyclown = 1,
+						/obj/item/clothing/mask/gas/clown_hat/sexy = 1,
 						/obj/item/clothing/under/rank/civilian/clown/sexy = 1,
-						/obj/item/clothing/mask/gas/sexymime = 1,
+						/obj/item/clothing/mask/gas/mime/sexy = 1,
 						/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
 						/obj/item/clothing/mask/rat/bat = 1,
 						/obj/item/clothing/mask/rat/bee = 1,