Merge pull request #11642 from PastelPrinceDan/mask

paper masks, emotional mask

code/modules/client/preference_setup/loadout/loadout_mask.dm

@@ -29,4 +29,12 @@
 /datum/gear/mask/plaguedoctor2
 	display_name = "golden plague doctor's mask"
 	path = /obj/item/clothing/mask/gas/plaguedoctor/gold
-	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+
+/datum/gear/mask/papermask
+	display_name = "paper mask"
+	path = /obj/item/clothing/mask/paper
+
+/datum/gear/mask/emotionalmask
+	display_name = "emotional mask"
+	path = /obj/item/clothing/mask/emotions

code/modules/clothing/masks/miscellaneous.dm

@@ -294,4 +294,70 @@
 	desc = "A black veil, typically worn at funerals or by goths."
 	w_class = ITEMSIZE_TINY
 	body_parts_covered = FACE
-	icon_state = "veil"
+	icon_state = "veil"
+
+/obj/item/clothing/mask/paper
+	name = "paper mask"
+	desc = "A neat, circular mask made out of paper. Perhaps you could try drawing on it with a pen!"
+	w_class = ITEMSIZE_SMALL
+	body_parts_covered = FACE
+	icon_state = "papermask"
+
+/obj/item/clothing/mask/paper/attackby(obj/item/I as obj, mob/living/user as mob, proximity)
+	if(!proximity) return
+	if(istype(I, /obj/item/weapon/pen))
+		var/drawtype = tgui_alert(user, "Choose what you'd like to draw.", "Faces", list("blank","neutral","eyes","sleeping", "heart", "core", "plus", "square", "bullseye", "vertical", "horizontal", "X", "bug eyes", "double", "mark" ))
+		switch(drawtype)
+			if("blank")
+				src.icon_state = "papermask"
+			if("neutral")
+				src.icon_state = "neutralmask"
+			if("eyes")
+				src.icon_state = "eyemask"
+			if("sleeping")
+				src.icon_state = "sleepingmask"
+			if("heart")
+				src.icon_state = "heartmask"
+			if("core")
+				src.icon_state = "coremask"
+			if("plus")
+				src.icon_state = "plusmask"
+			if("square")
+				src.icon_state = "squaremask"
+			if("bullseye")
+				src.icon_state = "bullseyemask"
+			if("vertical")
+				src.icon_state = "verticalmask"
+			if("horizontal")
+				src.icon_state = "horizontalmask"
+			if("X")
+				src.icon_state = "xmask"
+			if("bug eyes")
+				src.icon_state = "bugmask"
+			if("double")
+				src.icon_state = "doublemask"
+			if("mark")
+				src.icon_state = "markmask"
+	return
+
+/obj/item/clothing/mask/emotions
+	name = "emotional mask"
+	desc = "Express your happiness or hide your sorrows with this modular cutout. Draw your current emotions onto it with a pen!"
+	w_class = ITEMSIZE_SMALL
+	body_parts_covered = FACE
+	icon_state = "joy"
+
+/obj/item/clothing/mask/emotions/attackby(obj/item/I as obj, mob/living/user as mob, proximity)
+	if(!proximity) return
+	if(istype(I, /obj/item/weapon/pen))
+		var/drawtype = tgui_alert(user, "Choose what emotions you'd like to display.", "Emotions", list("joy","pensive","angry","flushed" ))
+		switch(drawtype)
+			if("joy")
+				src.icon_state = "joy"
+			if("pensive")
+				src.icon_state = "pensive"
+			if("angry")
+				src.icon_state = "angry"
+			if("flushed")
+				src.icon_state = "flushed"
+	return

maps/tether/tether-01-surface1.dmm

@@ -32984,6 +32984,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/pie,
 /obj/item/weapon/pen/crayon/marker/rainbow,
 /obj/item/weapon/pen/crayon/rainbow,
+/obj/item/clothing/mask/emotions,
 /obj/structure/closet/secure_closet{
 	desc = "Where the Clown keeps their hooliganisms.";
 	name = "funny locker";