diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3e857be9cfd..c031d443deb 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -113,6 +113,13 @@ M << "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!" return 1 +/obj/item/clothing/mask/gas/clownwiz + name = "wizard clown wig and mask" + desc = "Some pranksters are truly magical." + icon_state = "wizzclown" + item_state = "wizzclown" + flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS | BLOCKHAIR + /obj/item/clothing/mask/gas/virusclown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index ffaa03f92fc..3dc0fcbdcc7 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -12,6 +12,13 @@ icon_state = "redwizard" siemens_coefficient = 0.8 +/obj/item/clothing/head/wizard/clown + name = "purple wizard hat" + desc = "Strange-looking purple hat-wear that most certainly belongs to a real magic user." + icon_state = "wizhatclown" + item_state = "wizhatclown" // cheating + siemens_coefficient = 0.8 + /obj/item/clothing/head/wizard/fake name = "wizard hat" desc = "It has WIZZARD written across it in sequins. Comes with a cool beard." @@ -55,6 +62,11 @@ icon_state = "redwizard" item_state = "redwizrobe" +/obj/item/clothing/suit/wizrobe/clown + name = "Clown Robe" + desc = "A set of armoured robes that seem to radiate a dark power. That, and bad fashion decisions." + icon_state = "wizzclown" + item_state = "wizzclown" /obj/item/clothing/suit/wizrobe/marisa name = "Witch Robe" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index bea084a8168..d79b25ee51a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/in-hand/left/clownwiz.dmi b/icons/mob/in-hand/left/clownwiz.dmi index 054ea095103..7bfb9c487d0 100644 Binary files a/icons/mob/in-hand/left/clownwiz.dmi and b/icons/mob/in-hand/left/clownwiz.dmi differ diff --git a/icons/mob/in-hand/right/clownwiz.dmi b/icons/mob/in-hand/right/clownwiz.dmi index f7e060d25d2..f9dcdf15497 100644 Binary files a/icons/mob/in-hand/right/clownwiz.dmi and b/icons/mob/in-hand/right/clownwiz.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index ef47df89814..fbcb46cc4a5 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 20fd5a0bf85..efd6ca61fa4 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index de135fa0d5f..61fd73ef414 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 6d936f035c6..9d6f75629a3 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 64fffaf5786..cf83763f923 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 0f355f3edb5..71f855fd79c 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index aeec5410a18..cac563bfb4a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ