Straw Stuff + Fixes 2

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

@@ -426,6 +426,14 @@
 	display_name = "black and gold headdress"
 	path = /obj/item/clothing/head/blackngoldheaddress
 
+/datum/gear/head/plaguedoctor
+	display_name = "plague doctor's hat"
+	path = /obj/item/clothing/head/plaguedoctorhat
+
 /datum/gear/head/plaguedoctor2
 	display_name = "golden plague doctor's hat"
 	path = /obj/item/clothing/head/plaguedoctorhat/gold
+
+/datum/gear/head/wheat
+	display_name = "straw hat"
+	path = /obj/item/clothing/head/wheat

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

@@ -22,11 +22,64 @@
 	path = /obj/item/clothing/mask/surgical
 	cost = 2
 
-/datum/gear/mask/veil
+/datum/gear/mask/plaguedoctor
-	display_name = "black veil"
+	display_name = "plague doctor's mask"
-	path = /obj/item/clothing/mask/veil
+	path = /obj/item/clothing/mask/gas/plaguedoctor
+	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
 
 /datum/gear/mask/plaguedoctor2
 	display_name = "golden plague doctor's mask"
 	path = /obj/item/clothing/mask/gas/plaguedoctor/gold
+<<<<<<< HEAD
 	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+||||||| parent of 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories
+	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))
+=======
+	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+
+/datum/gear/mask/mouthwheat
+	display_name = "mouth wheat"
+	path = /obj/item/clothing/mask/mouthwheat
+
+/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))
+>>>>>>> 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories

code/modules/clothing/head/misc.dm

@@ -112,7 +112,7 @@
 
 /obj/item/clothing/head/plaguedoctorhat
 	name = "plague doctor's hat"
-	desc = "These were once used by Plague doctors. They're pretty much useless."
+	desc = "These were once used by Plague doctors, allegedly. They're pretty much useless."
 	icon_state = "plaguedoctor"
 	item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
 	permeability_coefficient = 0.01
@@ -525,3 +525,8 @@
 	name = "small cowboy hat"
 	desc = "For the tiniest of cowboys."
 	icon_state = "cowboy_small"
+
+/obj/item/clothing/head/wheat
+	name = "straw hat"
+	desc = "It's a hat made from synthetic straw. Brought to you by \"Country Girls LLC.\" the choice brand for the galaxy's working class."
+	icon_state = "wheat"

code/modules/clothing/masks/gasmask.dm

@@ -71,7 +71,7 @@
 
 /obj/item/clothing/mask/gas/plaguedoctor/gold
 	name = "gold plague doctor mask"
-	desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold."
+	desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply. This one is gold."
 	icon_state = "plaguedoctor2"
 
 /obj/item/clothing/mask/gas/swat

code/modules/clothing/masks/miscellaneous.dm

@@ -294,4 +294,203 @@
 	desc = "A black veil, typically worn at funerals or by goths."
 	w_class = ITEMSIZE_TINY
 	body_parts_covered = FACE
+<<<<<<< HEAD
 	icon_state = "veil"
+||||||| parent of 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories
+	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"
+=======
+	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"
+
+/obj/item/clothing/mask/mouthwheat
+	name = "mouth wheat"
+	desc = "100% synthetic \"Country Girls LLC.\" brand mouth wheat. Warning: not for actual consumption."
+	icon_state = "mouthwheat"
+	w_class = ITEMSIZE_SMALL
+	body_parts_covered = 0
+>>>>>>> 23daa38dfa... Merge pull request #11716 from GhostActual/straw_accessories