diff --git a/modular_splurt/code/modules/client/loadout/gloves.dm b/modular_splurt/code/modules/client/loadout/gloves.dm index cc21fff4ba..7533c7054c 100644 --- a/modular_splurt/code/modules/client/loadout/gloves.dm +++ b/modular_splurt/code/modules/client/loadout/gloves.dm @@ -11,3 +11,9 @@ /datum/gear/gloves/syntech/ring name = "Normalizer Ring" path = /obj/item/clothing/accessory/ring/syntech + +/datum/gear/gloves/clussy_gloves + name = "Clussy gloves" + path = /obj/item/clothing/gloves/clussy_gloves + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/head.dm b/modular_splurt/code/modules/client/loadout/head.dm index b9df52e150..8f3cadba6e 100644 --- a/modular_splurt/code/modules/client/loadout/head.dm +++ b/modular_splurt/code/modules/client/loadout/head.dm @@ -90,3 +90,10 @@ description = "A hat made of transparent fibers, often used with reinforcement kits." path = /obj/item/clothing/head/invisihat loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + +/datum/gear/head/clussy_wig + name = "Clussy wig" + path = /obj/item/clothing/head/clussy_wig + subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/shoes.dm b/modular_splurt/code/modules/client/loadout/shoes.dm index b75b1cd621..3e1c4320e4 100644 --- a/modular_splurt/code/modules/client/loadout/shoes.dm +++ b/modular_splurt/code/modules/client/loadout/shoes.dm @@ -40,3 +40,9 @@ /datum/gear/shoes/highheel_sandals name = "High-heel Sandals" path = /obj/item/clothing/shoes/highheel_sandals + +/datum/gear/shoes/clussy_heels + name = "Clussy heels" + path = /obj/item/clothing/shoes/clown_shoes/clussy_heels + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 4b39e33675..21c536040d 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -242,3 +242,10 @@ /datum/gear/uniform/suit/helltaker/skirt name = "Red Shirt with White Skirt" path = /obj/item/clothing/under/suit/helltaker/skirt + +/datum/gear/uniform/suit/clussy_outfit + name = "Clussy outfit" + path = /obj/item/clothing/under/rank/civilian/clown/clussy_outfit + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm b/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm new file mode 100644 index 0000000000..0d1d1facde --- /dev/null +++ b/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/gloves/clussy_gloves + name = "Clussy gloves" + desc = "Why honking horns when you can honk someone's balls?" + icon = 'modular_splurt/icons/obj/clothing/gloves.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/hands.dmi' + icon_state = "clussy_gloves" + item_state = "clussy_gloves" diff --git a/modular_splurt/code/modules/clothing/head/misc.dm b/modular_splurt/code/modules/clothing/head/misc.dm index 923fcf5f92..0b81ac7189 100644 --- a/modular_splurt/code/modules/clothing/head/misc.dm +++ b/modular_splurt/code/modules/clothing/head/misc.dm @@ -114,3 +114,12 @@ icon_state = "hat_transparent" // Makes the invisible hat not screw up hair. dynamic_hair_suffix = "" + +/obj/item/clothing/head/clussy_wig + name = "Clussy wig" + desc = "Wearing this will certainly make your pussy honk..." + icon = 'modular_splurt/icons/obj/clothing/head.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/head.dmi' + icon_state = "clussy_wig" + item_state = "clussy_wig" + flags_inv = HIDEHAIR diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm index f14db24f4f..51d6cb1ea5 100644 --- a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm @@ -12,6 +12,14 @@ ) ) +/obj/item/clothing/shoes/clown_shoes/clussy_heels + name = "Clussy heels" + desc = "The silliest footjob of all time." + icon = 'modular_splurt/icons/obj/clothing/shoes.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi' + icon_state = "clussy_heels" + mutantrace_variation = STYLE_DIGITIGRADE | STYLE_NO_ANTHRO_ICON + /obj/item/clothing/shoes/footwraps name = "cloth footwraps" desc = "A roll of treated canvas used for wrapping claws or paws." diff --git a/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 87001fc2cd..d147cc659d 100644 --- a/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -11,3 +11,12 @@ "mob_overlay_icon" = 'modular_splurt/icons/mob/clothing/uniform.dmi' ) ) + +/obj/item/clothing/under/rank/civilian/clown/clussy_outfit + name = "Clussy outfit" + desc = "Uniform for clowns who really enjoy being honked." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "clussy_outfit" + item_state = "clussy_outfit" + mutantrace_variation = STYLE_DIGITIGRADE | STYLE_NO_ANTHRO_ICON diff --git a/modular_splurt/code/modules/vending/autodrobe.dm b/modular_splurt/code/modules/vending/autodrobe.dm index 065deb7ff3..4a128495c8 100644 --- a/modular_splurt/code/modules/vending/autodrobe.dm +++ b/modular_splurt/code/modules/vending/autodrobe.dm @@ -18,7 +18,11 @@ /obj/item/clothing/under/suit/pencil/checkered = 3, /obj/item/clothing/under/suit/pencil/tan = 3, /obj/item/clothing/under/suit/pencil/green = 3, - /obj/item/clothing/under/suit/error = 1 + /obj/item/clothing/under/suit/error = 1, + /obj/item/clothing/under/rank/civilian/clown/clussy_outfit = 1, + /obj/item/clothing/gloves/clussy_gloves = 1, + /obj/item/clothing/head/clussy_wig = 1, + /obj/item/clothing/shoes/clown_shoes/clussy_heels = 1 ) var/list/extra_premium = list( /obj/item/clothing/under/suit/tuxedo = 1, diff --git a/modular_splurt/icons/mob/clothing/hands.dmi b/modular_splurt/icons/mob/clothing/hands.dmi index 689fc93fd8..7016adfe53 100644 Binary files a/modular_splurt/icons/mob/clothing/hands.dmi and b/modular_splurt/icons/mob/clothing/hands.dmi differ diff --git a/modular_splurt/icons/mob/clothing/head.dmi b/modular_splurt/icons/mob/clothing/head.dmi index baa44885b6..163e345dbc 100644 Binary files a/modular_splurt/icons/mob/clothing/head.dmi and b/modular_splurt/icons/mob/clothing/head.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes.dmi b/modular_splurt/icons/mob/clothing/shoes.dmi index 119cab3a7b..7813ff663e 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes.dmi and b/modular_splurt/icons/mob/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index 559b834879..d8ec6c094b 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ diff --git a/modular_splurt/icons/obj/clothing/gloves.dmi b/modular_splurt/icons/obj/clothing/gloves.dmi index e472d37ee4..b88b5f964a 100644 Binary files a/modular_splurt/icons/obj/clothing/gloves.dmi and b/modular_splurt/icons/obj/clothing/gloves.dmi differ diff --git a/modular_splurt/icons/obj/clothing/head.dmi b/modular_splurt/icons/obj/clothing/head.dmi index 052c3b817c..17e75af20e 100644 Binary files a/modular_splurt/icons/obj/clothing/head.dmi and b/modular_splurt/icons/obj/clothing/head.dmi differ diff --git a/modular_splurt/icons/obj/clothing/shoes.dmi b/modular_splurt/icons/obj/clothing/shoes.dmi index b4e0d3c95e..0cc65eea28 100644 Binary files a/modular_splurt/icons/obj/clothing/shoes.dmi and b/modular_splurt/icons/obj/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index ce39086b59..11b0371d15 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index efffd95223..1a9703b96c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4678,6 +4678,7 @@ #include "modular_splurt\code\modules\clothing\glasses\_glasses.dm" #include "modular_splurt\code\modules\clothing\glasses\hud.dm" #include "modular_splurt\code\modules\clothing\gloves\_gloves.dm" +#include "modular_splurt\code\modules\clothing\gloves\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\head\_head.dm" #include "modular_splurt\code\modules\clothing\head\hardhat.dm" #include "modular_splurt\code\modules\clothing\head\helmet.dm"