diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm
index 5de81409f3..493e9ab871 100644
--- a/code/modules/client/preference_setup/loadout/loadout_mask.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm
@@ -29,4 +29,39 @@
 /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.
\ No newline at end of file
+<<<<<<< HEAD
+	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+||||||| parent of d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
+	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
+=======
+	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
+
+/datum/gear/mask/gaiter
+	display_name = "neck gaiter selection"
+	path = /obj/item/clothing/mask/gaiter
+	cost = 1
+
+/datum/gear/mask/gaiter/New()
+	..()
+	var/list/gaiters = list()
+	for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
+		var/obj/item/clothing/mask/gaiter_type = gaiter
+		gaiters[initial(gaiter_type.name)] = gaiter_type
+	gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
+>>>>>>> d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index d972cf82cc..571711b5cd 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -294,4 +294,169 @@
 	desc = "A black veil, typically worn at funerals or by goths."
 	w_class = ITEMSIZE_TINY
 	body_parts_covered = FACE
-	icon_state = "veil"
\ No newline at end of file
+<<<<<<< HEAD
+	icon_state = "veil"
+||||||| parent of d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
+	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
+=======
+	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
+
+//Gaiter scarves
+/obj/item/clothing/mask/gaiter
+	name = "red neck gaiter"
+	desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face."
+	icon_state = "gaiter_red"
+
+/obj/item/clothing/mask/gaiter/attack_self(mob/user as mob)
+	if(src.icon_state == initial(icon_state))
+		src.icon_state = "[icon_state]_up"
+		to_chat(user, "You pull the gaiter up over your nose.")
+	else
+		src.icon_state = initial(icon_state)
+		to_chat(user, "You tug the gaiter down around your neck.")
+	update_clothing_icon()	//so our mob-overlays update
+
+/obj/item/clothing/mask/gaiter/tan
+	name = "tan neck gaiter"
+	icon_state = "gaiter_tan"
+
+/obj/item/clothing/mask/gaiter/gray
+	name = "gray neck gaiter"
+	icon_state = "gaiter_gray"
+
+/obj/item/clothing/mask/gaiter/green
+	name = "green neck gaiter"
+	icon_state = "gaiter_green"
+>>>>>>> d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry