diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 7d0ffcca5..7557153ca 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -38,6 +38,8 @@ /obj/item/clothing/under/scratch/skirt = 2, /obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2, /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2, + /obj/item/clothing/neck/cloak/polychromic/ = 5, + /obj/item/clothing/neck/cloak/polychromic/half = 5, /obj/item/clothing/neck/tie/blue = 3, /obj/item/clothing/neck/tie/red = 3, /obj/item/clothing/neck/tie/black = 3, diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index a239f1f5d..af576b87a 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm b/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm index c6b153fd3..f14ad8bea 100644 --- a/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm +++ b/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm @@ -13,6 +13,21 @@ secondary_color = "#FFFFFF" tertiary_color = "#808080" +/obj/item/clothing/neck/cloak/polychromic/half //enables all three overlays to reduce copypasta and defines basic stuff + name = "polychromic half-cloak" + desc = "For when you want to show off half of 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 = "polyhc" + item_color = "polyhc" + 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) @@ -37,4 +52,4 @@ item_color = "polyce" primary_color = "#808080" //RGB in hexcode secondary_color = "#8CC6FF" - tertiary_color = "#FF3535" \ No newline at end of file + tertiary_color = "#FF3535" diff --git a/modular_citadel/icons/polyclothes/item/neck.dmi b/modular_citadel/icons/polyclothes/item/neck.dmi index e2792cf9d..2afedadb3 100644 Binary files a/modular_citadel/icons/polyclothes/item/neck.dmi and b/modular_citadel/icons/polyclothes/item/neck.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/neck.dmi b/modular_citadel/icons/polyclothes/mob/neck.dmi index 529c64caa..f9c49466f 100644 Binary files a/modular_citadel/icons/polyclothes/mob/neck.dmi and b/modular_citadel/icons/polyclothes/mob/neck.dmi differ