diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index c33e6098c0..d78488ec0b 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -119,6 +119,23 @@ to_chat(user, "Your Clown Mask has now morphed into [choice], all praise the Honkmother!") return TRUE +/obj/item/clothing/mask/gas/clown_hat_polychromic + name = "polychromic clown wig and mask" + desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." + clothing_flags = ALLOWINTERNALS + icon_state = "clown" + item_state = "clown_hat" + dye_color = "clown" + w_class = WEIGHT_CLASS_SMALL + flags_cover = MASKCOVERSEYES + resistance_flags = FLAMMABLE + dog_fashion = /datum/dog_fashion/head/clown + var/list/poly_colors = list("#FF8000", "#FFFFFF", "#FF0000", "#0000FF", "#FFFF00") + +/obj/item/clothing/mask/gas/clown_hat_polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, poly_colors, 5, names = list("Hair", "Frame", "Mouth", "Eyes", "Markings")) + /obj/item/clothing/mask/gas/clown_hat/sexy name = "sexy-clown wig and mask" desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 470a3695fc..25c40ee5d8 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -32,6 +32,20 @@ can_adjust = FALSE mutantrace_variation = STYLE_DIGITIGRADE //The clown suit must look funny, no taur alpha masks where possible. +/obj/item/clothing/under/rank/civilian/polychromic_clown + name = "polychromic clown suit" + desc = "'HONK!'" + icon_state = "clown" + item_state = "clown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE //The clown suit must look funny, no taur alpha masks where possible. + var/list/poly_colors = list("#FF0000", "#FF99FF", "#FFFF00", "#FFFFFF") + +/obj/item/clothing/under/rank/civilian/polychromic_clown/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, poly_colors, 4) + /obj/item/clothing/under/rank/civilian/clown/blue name = "blue clown suit" desc = "'BLUE HONK!'" diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index b0cbc3b623..2413b52d71 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 7f1717b8ca..04d9b20a75 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index ebc7140dae..f5bc9e7046 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 3a5dfb97a9..c16b416cd8 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/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index 576b29cddc..52e79884c2 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -30,4 +30,8 @@ name = "Paper mask" path = /obj/item/clothing/mask/paper cost = 2 - + +/datum/gear/mask/polychromic_clown + name = "polychromic clown wig and mask" + path = /obj/item/clothing/mask/gas/clown_hat_polychromic + restricted_roles = list("Clown") diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 86fcc867a3..c16aa5ea55 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -739,3 +739,9 @@ path = /obj/item/clothing/under/rank/cargo/tech/long subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Cargo Technician") + +/datum/gear/uniform/clown_polychromic + name = "polychromic clown suit" + path = /obj/item/clothing/under/rank/civilian/polychromic_clown + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS + restricted_roles = list("Clown")