diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 58eec484c1c..916a9d157dc 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -293,7 +293,7 @@ implants = list(/obj/item/implant/sad_trombone) backpack = /obj/item/storage/backpack/clown - satchel = /obj/item/storage/backpack/clown + satchel = /obj/item/storage/backpack/satchel/clown dufflebag = /obj/item/storage/backpack/duffel/clown /datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index cba3393e3b2..0e812f8fc56 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -267,6 +267,12 @@ icon_state = "satchel-norm" item_state = "satchel-norm" +/obj/item/storage/backpack/satchel/clown + name = "Tickles Von Squeakerton" + desc = "A satchel with extra pockets for all your banana storing needs!" + icon_state = "satchel-clown" + item_state = "satchel-clown" + /obj/item/storage/backpack/satchel_eng name = "industrial satchel" desc = "A tough satchel with extra pockets." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm index bfaf642d5a7..fc7bafad01d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm @@ -6,7 +6,11 @@ /obj/structure/closet/secure_closet/clown/populate_contents() new /obj/item/storage/backpack/clown(src) + new /obj/item/storage/backpack/duffel/clown(src) + new /obj/item/storage/backpack/satchel/clown(src) new /obj/item/clothing/under/rank/civilian/clown(src) + new /obj/item/clothing/under/rank/civilian/clown/skirt(src) + new /obj/item/clothing/under/rank/civilian/clown/sexy(src) new /obj/item/clothing/shoes/clown_shoes(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/mask/gas/clown_hat(src) @@ -33,6 +37,8 @@ new /obj/item/clothing/mask/gas/mime(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/under/rank/civilian/mime(src) + new /obj/item/clothing/under/rank/civilian/mime/skirt(src) + new /obj/item/clothing/under/rank/civilian/mime/sexy(src) new /obj/item/clothing/suit/suspenders(src) new /obj/item/clothing/gloves/color/white(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index b377d517e2b..89b461bbcec 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -203,6 +203,16 @@ path = /obj/item/clothing/under/rank/security/head_of_security/skirt allowed_roles = list("Head of Security") +/datum/gear/uniform/skirt/job/clown + display_name = "Skirt, clown" + path = /obj/item/clothing/under/rank/civilian/clown/skirt + allowed_roles = list("Clown") + +/datum/gear/uniform/skirt/job/mime + display_name = "Skirt, mime" + path = /obj/item/clothing/under/rank/civilian/mime/skirt + allowed_roles = list("Mime") + /datum/gear/uniform/skirt/job/head_of_personnel display_name = "Skirt, hop" path = /obj/item/clothing/under/rank/civilian/hop/skirt diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 3c91205d81e..9098bfc1097 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -90,9 +90,16 @@ SSticker.score.score_clown_abuse++ return ..() +/obj/item/clothing/under/rank/civilian/clown/skirt + name = "clown skirt" + desc = "'HONK!'" + icon_state = "clown_skirt" + item_state = "clown_skirt" + item_color = "clown_skirt" + /obj/item/clothing/under/rank/civilian/clown/sexy name = "sexy-clown suit" - desc = "It makes you look HONKable!" + desc = "It makes you want to practice clown law." icon_state = "sexyclown" item_state = "sexyclown" item_color = "sexyclown" @@ -107,6 +114,13 @@ item_state = "mime" item_color = "mime" +/obj/item/clothing/under/rank/civilian/mime/skirt + name = "mime's skirt" + desc = "It's not very colourful." + icon_state = "mime_skirt" + item_state = "mime_skirt" + item_color = "mime_skirt" + /obj/item/clothing/under/rank/civilian/mime/sexy name = "sexy mime outfit" desc = "The only time when you DON'T enjoy looking at someone's rack." diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index e9fb5b582b2..3eea2f356ae 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi index 53ce570efc5..34f04fdf40d 100644 Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi index 88be281f984..e426449c4db 100644 Binary files a/icons/mob/clothing/species/grey/back.dmi and b/icons/mob/clothing/species/grey/back.dmi differ diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi index aef84913923..a09f69cdd88 100644 Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi index 9c8d974d336..c655ec2f629 100644 Binary files a/icons/mob/clothing/species/kidan/under/civilian.dmi and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi index 25b86be5931..95800a6c6f8 100644 Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi index 63f65aa8e3c..17c4e4a3997 100644 Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 3811856e8a7..c5a92048869 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 8f9f52bd621..91ff13ceb36 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index b436595e731..1980c4c38d1 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 774f95bf868..c6879e99fb2 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 768f5f64ed6..b5805bbd6ae 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ