Skip to content

Commit

Permalink
Entertainer Drip (Mime/Clown) (#23546)
Browse files Browse the repository at this point in the history
* entertainerdrip

* duffelshadingitem
  • Loading branch information
Christasmurf authored Dec 28, 2023
1 parent 3f5c57b commit 95c4666
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/game/jobs/job/support.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/weapons/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions code/modules/client/preference/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion code/modules/clothing/under/jobs/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,16 @@
SSticker.score.score_clown_abuse++
return ..()

/obj/item/clothing/under/rank/civilian/clown/skirt
name = "clown skirt"
desc = "<i>'HONK!'</i>"
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"
Expand All @@ -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."
Expand Down
Binary file modified icons/mob/clothing/back.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/under/civilian.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/back.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/under/civilian.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/kidan/under/civilian.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/back.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/under/civilian.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/civilian.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/civilian.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.

0 comments on commit 95c4666

Please sign in to comment.