diff --git a/modular_citadel/code/modules/clothing/clothing.dm b/modular_citadel/code/modules/clothing/clothing.dm index d638f59808..fc71d5bdde 100644 --- a/modular_citadel/code/modules/clothing/clothing.dm +++ b/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) ..() diff --git a/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm b/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm new file mode 100644 index 0000000000..c6b153fd36 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index 4f8985dac5..5f4c78f554 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/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 \ No newline at end of file + 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" \ No newline at end of file diff --git a/modular_citadel/icons/polyclothes/item/neck.dmi b/modular_citadel/icons/polyclothes/item/neck.dmi new file mode 100644 index 0000000000..e2792cf9d0 Binary files /dev/null and b/modular_citadel/icons/polyclothes/item/neck.dmi differ diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index 06b880b48c..2bca920c63 100644 Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and b/modular_citadel/icons/polyclothes/item/uniform.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/neck.dmi b/modular_citadel/icons/polyclothes/mob/neck.dmi new file mode 100644 index 0000000000..529c64caa2 Binary files /dev/null and b/modular_citadel/icons/polyclothes/mob/neck.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index 2121c3d5a5..0ea6fc7178 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 40cd61c596..f851aa65c4 100755 --- a/tgstation.dme +++ b/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"