diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 2a69a5d669..07741208c3 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -487,13 +487,17 @@ item_state = "militaryjacket" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) -/obj/item/clothing/suit/jacket/urbanjacket +/obj/item/clothing/suit/jacket/urbanjacket/polychromic name = "urban jacket" desc = "A canvas jacket styled with a fur neck piece, stylish." icon_state = "urbanjacket" item_state = "urbanjacket" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) +/obj/item/clothing/suit/jacket/urbanjacket/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#26321D", "#CBBDAF", "#292929"), 3) + /obj/item/clothing/suit/jacket/letterman name = "letterman jacket" desc = "A classic brown letterman jacket. Looks pretty hot and heavy." diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index c93cefeae9..a76bf41e62 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -46,6 +46,17 @@ desc = "Some tan pants. You look like a white collar worker with these on." icon_state = "tanpants" +/obj/item/clothing/under/pants/polypants/polychromic + name = "polychromic pants" + desc = "Some stylish pair of pants made from polychrome." + icon_state = "polypants" + item_state = "polypants" + var/list/poly_colors = list("#75634F", "#3D3D3D", "#575757") + +/obj/item/clothing/under/pants/polypants/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, poly_colors, 3) + /obj/item/clothing/under/pants/track name = "track pants" desc = "A pair of track pants, for the athletic." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index b68105dcf8..707557ff73 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -68,13 +68,14 @@ /obj/item/clothing/under/pants/black = 4, /obj/item/clothing/under/pants/tan = 4, /obj/item/clothing/under/pants/track = 3, + /obj/item/clothing/under/pants/polypants = 4, /obj/item/clothing/accessory/suitjacket = 2, /obj/item/clothing/accessory/suitjacket/charcoal = 2, /obj/item/clothing/accessory/suitjacket/navy = 2, /obj/item/clothing/accessory/suitjacket/burgundy = 2, /obj/item/clothing/accessory/suitjacket/checkered = 2, /obj/item/clothing/suit/jacket/miljacket = 5, - /obj/item/clothing/suit/jacket/urbanjacket = 5, + /obj/item/clothing/suit/jacket/urbanjacket/polychromic = 5, /obj/item/clothing/under/suit/white_on_white/skirt = 2, /obj/item/clothing/under/rank/captain/suit/skirt = 2, /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 5fca3059c1..dadb2ea963 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index f1ef3bf1fa..325f04cede 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 0cc1506e1b..98ec436b86 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d126f31746..da3dbe6115 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b8f399b4a8..4ad3d4124f 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 8ff7cb363e..52e83aee32 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -168,8 +168,10 @@ /datum/gear/suit/urbanjacket name = "Urban Jacket" - path = /obj/item/clothing/suit/jacket/urbanjacket + path = /obj/item/clothing/suit/jacket/urbanjacket/polychromic subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#26321D", "#CBBDAF", "#292929") /datum/gear/suit/ianshirt name = "Ian Shirt" diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 4638c34285..1484f257a4 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -170,6 +170,13 @@ name = "Tan Pants" path = /obj/item/clothing/under/pants/tan +/datum/gear/uniform/pants/polypants + name = "Polychromic Pants" + path = /obj/item/clothing/under/pants/polypants/polychromic + cost = 2 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#75634F", "#3D3D3D", "#575757") + /datum/gear/uniform/pants/track name = "Track Pants" path = /obj/item/clothing/under/pants/track