add: 8 new ponchos + 4 new uniforms + poncho resprite. (ss220-space#3867

)

code/game/machinery/vending.dm

@@ -1415,9 +1415,7 @@
 					/obj/item/clothing/suit/apron/overalls = 1,
 					/obj/item/clothing/head/rabbitears =1,
 					/obj/item/clothing/head/sombrero = 1,
-					/obj/item/clothing/neck/poncho = 1,
-					/obj/item/clothing/neck/poncho/green = 1,
-					/obj/item/clothing/neck/poncho/red = 1,
+					/obj/item/clothing/neck/poncho = 3,
 					/obj/item/clothing/accessory/blue = 1,
 					/obj/item/clothing/accessory/red = 1,
 					/obj/item/clothing/accessory/black = 1,
@@ -1443,6 +1441,10 @@
 					/obj/item/clothing/suit/snowman = 1,
 					/obj/item/clothing/head/snowman = 1,
 					/obj/item/clothing/head/cueball = 1,
+					/obj/item/clothing/under/red_chaps = 1,
+					/obj/item/clothing/under/white_chaps = 1,
+					/obj/item/clothing/under/tan_chaps = 1,
+					/obj/item/clothing/under/brown_chaps = 1,
 					/obj/item/clothing/under/scratch = 1,
 					/obj/item/clothing/under/victdress = 1,
 					/obj/item/clothing/under/victdress/red = 1,

code/game/machinery/washing_machine.dm

@@ -75,6 +75,9 @@
 			var/new_sheet_name = ""
 			var/new_softcap_icon_state = ""
 			var/new_softcap_name = ""
+			var/new_poncho_icon_state = ""
+			var/new_poncho_item_state = ""
+			var/new_poncho_name = ""
 			var/new_desc = "The colors are a bit dodgy."
 			for(var/T in typesof(/obj/item/clothing/under))
 				var/obj/item/clothing/under/J = new T
@@ -127,6 +130,15 @@
 					qdel(H)
 					break
 				qdel(H)
+			for(var/T in typesof(/obj/item/clothing/neck/poncho))
+				var/obj/item/clothing/neck/poncho/P = new T
+				if(wash_color == P.item_color)
+					new_poncho_icon_state = P.icon_state
+					new_poncho_item_state = P.item_state
+					new_poncho_name = P.name
+					qdel(P)
+					break
+				qdel(P)
 			if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name)
 				for(var/obj/item/clothing/under/J in contents)
 					if(!J.dyeable)
@@ -181,6 +193,14 @@
 					H.item_color = wash_color
 					H.name = new_softcap_name
 					H.desc = new_desc
+			if(new_poncho_icon_state && new_poncho_item_state && new_poncho_name)
+				for(var/obj/item/clothing/neck/poncho/P in contents)
+					if(!P.dyeable)
+						continue
+					P.item_state = new_poncho_item_state
+					P.icon_state = new_poncho_icon_state
+					P.item_color = wash_color
+					P.name = new_poncho_name
 		QDEL_NULL(crayon)
 
 
@@ -241,7 +261,8 @@
 		istype(W,/obj/item/clothing/gloves) || \
 		istype(W,/obj/item/clothing/shoes) || \
 		istype(W,/obj/item/clothing/suit) || \
-		istype(W,/obj/item/bedsheet))
+		istype(W,/obj/item/bedsheet) || \
+		istype(W,/obj/item/clothing/neck/poncho))
 
 		//YES, it's hardcoded... saves a var/can_be_washed for every single clothing item.
 		if( istype(W,/obj/item/clothing/suit/space ) )

code/modules/client/preference/loadout/loadout_neck.dm

@@ -128,14 +128,6 @@
 	display_name = "poncho, classic"
 	path = /obj/item/clothing/neck/poncho
 
-/datum/gear/neck/poncho/green
-	display_name = "poncho, green"
-	path = /obj/item/clothing/neck/poncho/green
-
-/datum/gear/neck/poncho/red
-	display_name = "poncho, red"
-	path = /obj/item/clothing/neck/poncho/red
-
 /datum/gear/neck/poncho/security
 	display_name = "poncho, corporate"
 	path = /obj/item/clothing/neck/poncho/security

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -105,6 +105,25 @@
 	display_name = "executive suit"
 	path = /obj/item/clothing/under/suit_jacket/really_black
 
+/datum/gear/uniform/chaps
+	subtype_path = /datum/gear/uniform/chaps
+
+/datum/gear/uniform/chaps/red
+	display_name = "chaps, red"
+	path = /obj/item/clothing/under/red_chaps
+
+/datum/gear/uniform/chaps/white
+	display_name = "chaps, white"
+	path = /obj/item/clothing/under/white_chaps
+
+/datum/gear/uniform/chaps/tan
+	display_name = "chaps, tan"
+	path = /obj/item/clothing/under/tan_chaps
+
+/datum/gear/uniform/chaps/brown
+	display_name = "chaps, brown"
+	path = /obj/item/clothing/under/brown_chaps
+
 /datum/gear/uniform/skirt
 	subtype_path = /datum/gear/uniform/skirt
 

code/modules/clothing/neck/ponchos.dm

@@ -1,41 +1,161 @@
 //Ponchos!
 
 /obj/item/clothing/neck/poncho
-	name = "poncho"
-	desc = "Your classic, non-racist poncho."
+	name = "classic poncho"
+	desc = "It can protect you from the scorching sun and save your strength in the desert. You can buy one of these for a fistful of credits."
 	icon_state = "classicponcho"
-
+	var/flipped = FALSE
+	dyeable = TRUE
+	item_color = "classic"
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/neck.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/neck.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi',
 		"Monkey" = 'icons/mob/clothing/species/monkey/neck.dmi',
 		"Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi',
 		"Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi',
 		"Neara" = 'icons/mob/clothing/species/monkey/neck.dmi',
-		"Stok" = 'icons/mob/clothing/species/monkey/neck.dmi'
+		"Stok" = 'icons/mob/clothing/species/monkey/neck.dmi',
+		"Plasmaman" = 'icons/mob/clothing/species/plasmaman/neck.dmi',
+		"Unathi" = 'icons/mob/clothing/species/unathi/neck.dmi',
+		"Ash Walker" = 'icons/mob/clothing/species/unathi/neck.dmi',
+		"Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/neck.dmi',
+		"Draconid" =  'icons/mob/clothing/species/unathi/neck.dmi',
+		"Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
+		"Wryn" = 'icons/mob/clothing/species/wryn/neck.dmi'
 	)
 
-/obj/item/clothing/neck/poncho/green
-	name = "green poncho"
-	desc = "Your classic, non-racist poncho. This one is green."
-	icon_state = "greenponcho"
+/obj/item/clothing/neck/poncho/update_icon()
+	. = ..()
+	if(flipped)
+		icon_state = "[item_color]poncho_flip"
+	else
+		icon_state = "[item_color]poncho"
+
+/obj/item/clothing/neck/poncho/AltClick(mob/living/carbon/human/user)
+	if(!iscarbon(user))
+		..()
+	else if(user.neck != src)
+		..()
+	else
+		flip(user)
+
+/obj/item/clothing/neck/poncho/verb/flip_poncho()
+	set name = "Flip poncho"
+	set category = "Object"
+	set desc = "Flip poncho behind your back"
+
+	if(!iscarbon(usr))
+		return
+	var/mob/living/carbon/human/user = usr
+	if(user.neck != src)
+		to_chat(user, span_warning("Poncho must be equipped before flipping!"))
+		return
+	flip(user)
+
+/obj/item/clothing/neck/poncho/dropped(mob/user, silent = FALSE)
+	..()
+	if(flipped)
+		flipped = FALSE
+		update_icon()
+
+/obj/item/clothing/neck/poncho/equipped(mob/user, slot, initial)
+	. = ..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/human = user
+		if((slot != human.neck) && flipped)
+			flipped = FALSE
+			update_icon()
+
+/obj/item/clothing/neck/poncho/proc/flip(mob/user)
+	if(user.incapacitated())
+		to_chat(user, span_warning("You can't do that right now!"))
+		return
+	flipped = !flipped
+	if(flipped)
+		update_icon()
+		to_chat(user, "You flip [src] behind your back.")
+	else
+		update_icon()
+		to_chat(user, "You flip [src] to its normal position.")
+	user.update_inv_neck()
 
 /obj/item/clothing/neck/poncho/red
 	name = "red poncho"
-	desc = "Your classic, non-racist poncho. This one is red."
+	desc = "It is a red dead color. It makes you look like a rascal."
 	icon_state = "redponcho"
+	item_color = "red"
+
+/obj/item/clothing/neck/poncho/orange
+	name = "orange poncho"
+	desc = "This one in particular is especially nice for fooling around in."
+	icon_state = "orangeponcho"
+	item_color = "orange"
+
+/obj/item/clothing/neck/poncho/yellow
+	name = "yellow poncho"
+	desc = "A souvenir shop curio straight from New New Mexico. Hola, Amigo!"
+	icon_state = "yellowponcho"
+	item_color = "yellow"
+
+/obj/item/clothing/neck/poncho/green
+	name = "green poncho"
+	desc = "The lines on the cloth continue the mustache line quite well."
+	icon_state = "greenponcho"
+	item_color = "green"
+
+/obj/item/clothing/neck/poncho/blue
+	name = "blue poncho"
+	desc = "Every bounty hunter's modern day outfit. Well conceals holster, ammunition loadout, body armor, scabbard, a pair of handguns, sawed-off shotgun and grenades."
+	icon_state = "blueponcho"
+	item_color = "blue"
+
+/obj/item/clothing/neck/poncho/purple
+	name = "purple poncho"
+	desc = "The case when modern designers butchered the classics."
+	icon_state = "purpleponcho"
+	item_color = "purple"
+
+/obj/item/clothing/neck/poncho/white
+	name = "white poncho"
+	desc = "An exact replica of the most famous gunfighter on the New Frontier. The one who was shot in a gunfight."
+	icon_state = "whiteponcho"
+	item_color = "white"
+
+/obj/item/clothing/neck/poncho/black
+	name = "black poncho"
+	desc = "Label states, \"Do not ride your horse faster than 88 miles per hour to avoid breaking the time loop.\""
+	icon_state = "blackponcho"
+	item_color = "black"
 
 /obj/item/clothing/neck/poncho/ponchoshame
 	name = "poncho of shame"
 	desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseperable. Literally."
-	icon_state = "ponchoshame"
+	icon_state = "shameponcho"
+	item_color = "shame"
 	flags = NODROP
 
 /obj/item/clothing/neck/poncho/security
 	name = "corporate poncho"
 	desc = "Пончо в корпоративных цветах, при его виде пропадает желание нелегально пересекать сектор"
 	icon_state = "secponcho"
+	item_color = "sec"
+
+/obj/item/clothing/neck/poncho/mime
+	name = "black and white poncho"
+	desc = "The motley patterns unfold throughout the garment, forming the outline of a skull on the back."
+	icon_state = "mimeponcho"
+	item_color = "mime"
+
+/obj/item/clothing/neck/poncho/rainbow
+	name = "multicolored poncho"
+	desc = "Popular among pacifists and other drug addicts."
+	icon_state = "rainbowponcho"
+	item_color = "rainbow"
 
 /obj/item/clothing/neck/poncho/tactical
 	name = "tactical poncho"
-	desc = "A short and black poncho for some tactical operations in hot areas of space"
+	desc = "A short and black poncho for some tactical operations in hot areas of space."
 	icon_state = "tacticalponcho"
+	item_color = "tactical"
+	sprite_sheets = list()