Merge pull request #6331 from Michiyamenotehifunana/polychrome-for-donators

Preliminary Implementation of Polychromatic Donator stuff

modular_citadel/code/modules/clothing/clothing.dm

@@ -63,19 +63,19 @@
 				if(primary_color_input)	//Checks if the color selected is NULL, rejects it if it is NULL.
 					primary_color = sanitize_hexcolor(primary_color_input, desired_format=6, include_crunch=1)	//formats the selected color properly
 				update_icon()	//updates the item icon
-				user.update_inv_w_uniform()	//updates the worn icon
+				user.regenerate_icons()	//updates the worn icon. Probably a bad idea, but it works.
 			if("Secondary Color")
 				var/secondary_color_input = input(usr,"","Choose Secondary Color",secondary_color) as color|null
 				if(secondary_color_input)
 					secondary_color = sanitize_hexcolor(secondary_color_input, desired_format=6, include_crunch=1)
 				update_icon()
-				user.update_inv_w_uniform()
+				user.regenerate_icons()
 			if("Tertiary Color")
 				var/tertiary_color_input = input(usr,"","Choose Tertiary Color",tertiary_color) as color|null
 				if(tertiary_color_input)
 					tertiary_color = sanitize_hexcolor(tertiary_color_input, desired_format=6, include_crunch=1)
 				update_icon()
-				user.update_inv_w_uniform()
+				user.regenerate_icons()
 
 /obj/item/clothing/examine(mob/user)
 	..()

modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm

@@ -0,0 +1,40 @@
+/obj/item/clothing/neck/cloak/polychromic	//enables all three overlays to reduce copypasta and defines basic stuff
+	name = "polychromic cloak"
+	desc = "For when you want to show off your horrible colour coordination skills."
+	icon = 'modular_citadel/icons/polyclothes/item/neck.dmi'
+	alternate_worn_icon = 'modular_citadel/icons/polyclothes/mob/neck.dmi'
+	icon_state = "polyce"
+	item_color = "polyce"
+	item_state = "qmcloak"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF" //RGB in hexcode
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#808080"
+
+/obj/item/clothing/neck/cloak/polychromic/worn_overlays(isinhands, icon_file)	//this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
+	. = ..()
+	if(hasprimary | hassecondary | hastertiary)
+		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
+			if(hasprimary)	//checks if overlays are enabled
+				var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary")	//automagical sprite selection
+				primary_worn.color = primary_color	//colors the overlay
+				. += primary_worn	//adds the overlay onto the buffer list to draw on the mob sprite.
+			if(hassecondary)
+				var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
+				secondary_worn.color = secondary_color
+				. += secondary_worn
+			if(hastertiary)
+				var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
+				tertiary_worn.color = tertiary_color
+				. += tertiary_worn
+
+/obj/item/clothing/neck/cloak/polychromic/polyce	//DONATOR ITEM
+	name = "polychromic embroidered cloak"
+	desc = "A fancy cloak embroidered with polychromatic thread in a pattern that reminds one of the wielders of unlimited power."
+	icon_state = "polyce"
+	item_color = "polyce"
+	primary_color = "#808080" //RGB in hexcode
+	secondary_color = "#8CC6FF"
+	tertiary_color = "#FF3535"

modular_citadel/code/modules/clothing/under/polychromic_clothes.dm

@@ -105,4 +105,14 @@
 	primary_color = "#FFFFFF" //RGB in hexcode
 	secondary_color = "#F08080"
 	gender = PLURAL	//Because shortS
-	body_parts_covered = GROIN	//Because there's no shirt included
+	body_parts_covered = GROIN	//Because there's no shirt included
+
+/obj/item/clothing/under/polychromic/pleat
+	name = "polychromic pleated skirt"
+	desc = "A magnificent pleated skirt complements the woolen polychromatic sweater."
+	icon_state = "polypleat"
+	item_color = "polypleat"
+	item_state = "rainbow"
+	primary_color = "#8CC6FF" //RGB in hexcode
+	secondary_color = "#808080"
+	tertiary_color = "#FF3535"

tgstation.dme

@@ -2749,6 +2749,7 @@
 #include "modular_citadel\code\modules\client\verbs\who.dm"
 #include "modular_citadel\code\modules\clothing\clothing.dm"
 #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
+#include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm"
 #include "modular_citadel\code\modules\clothing\suits\suits.dm"
 #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm"
 #include "modular_citadel\code\modules\clothing\under\trek_under.dm"