Skip to content

Commit

Permalink
Readds and changes some jester clothing.
Browse files Browse the repository at this point in the history
  • Loading branch information
Skelessant committed Dec 6, 2023
1 parent f374aa8 commit ea1018d
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 6 deletions.
2 changes: 2 additions & 0 deletions code/modules/clothing/head/hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@
icon_state = "jester_hat"

/obj/item/clothing/head/costume/jester/alt
name = "yellow jester hat"
desc = "It's more a hood really."
icon_state = "jester2"

/obj/item/clothing/head/costume/rice_hat
Expand Down
12 changes: 10 additions & 2 deletions code/modules/clothing/shoes/clown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@
to_chat(user, span_notice("You switch on the waddle dampeners!"))
enabled_waddle = FALSE

/obj/item/clothing/shoes/clown_shoes/jester
name = "jester shoes"
/obj/item/clothing/shoes/clown_shoes/clown_jester_shoes
name = "clown jester shoes"
desc = "A court jester's shoes, updated with modern squeaking technology."
icon_state = "jester_shoes"
squeak_sound = list('sound/effects/clown_jingle1.ogg'=1, 'sound/effects/clown_jingle2.ogg') //jingHONK jinglHONK jHONKgle jiHONKgle

/obj/item/clothing/shoes/clown_shoes/meown_shoes
name = "meown shoes"
Expand All @@ -61,3 +62,10 @@
icon_state = "ducky_shoes"
inhand_icon_state = "ducky_shoes"
squeak_sound = list('sound/effects/quack.ogg'=1) //quack quack quack quack

/obj/item/clothing/shoes/clown_shoes/green_jester_shoes
name = "jester shoes"
desc = "Shoes that jingle with every step!!"
icon_state = "green_jester_shoes"
inhand_icon_state = "green_jester_shoes"
squeak_sound = list('sound/effects/jingle.ogg'=1) //jingle jingle jingle jingle
2 changes: 2 additions & 0 deletions code/modules/clothing/under/jobs/civilian/clown_mime.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@
icon_state = "jester"

/obj/item/clothing/under/rank/civilian/clown/jester/alt
name = "yellow jester suit"
icon_state = "jester2"
desc = "Smells like burgers and fries."

/obj/item/clothing/under/rank/civilian/clown/sexy
name = "sexy-clown suit"
Expand Down
5 changes: 4 additions & 1 deletion code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,11 @@
/obj/item/clothing/mask/gas/sexymime = 1,
/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
/obj/item/clothing/under/rank/civilian/clown/jester = 1,
/obj/item/clothing/head/costume/jester = 1,
/obj/item/clothing/under/rank/civilian/clown/jester = 1,
/obj/item/clothing/shoes/clown_shoes/green_jester_shoes =1,
/obj/item/clothing/head/costume/jester/alt =1,
/obj/item/clothing/under/rank/civilian/clown/jester/alt =1,
/obj/item/clothing/under/costume/villain = 1,
/obj/item/clothing/suit/costume/joker = 1,
/obj/item/clothing/under/costume/joker = 1,
Expand Down
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/shoes_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/shoes_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion monkestation/code/modules/loadouts/items/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(loadout_shoes, generate_loadout_items(/datum/loadout_item/shoes

/datum/loadout_item/shoes/jester
name = "Jester Shoes"
item_path = /obj/item/clothing/shoes/clown_shoes/jester
item_path = /obj/item/clothing/shoes/clown_shoes/clown_jester_shoes
restricted_roles = list(JOB_CLOWN)

/*
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/store/store_items/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(store_shoes, generate_store_items(/datum/store_item/shoes))

/datum/store_item/shoes
category = LOADOUT_ITEM_SHOES

/datum/store_item/shoes/winter_boots
name = "Winter Boots"
item_path = /obj/item/clothing/shoes/winterboots
Expand Down Expand Up @@ -112,5 +112,5 @@ GLOBAL_LIST_INIT(store_shoes, generate_store_items(/datum/store_item/shoes))

/datum/store_item/shoes/jester
name = "Jester Shoes"
item_path = /obj/item/clothing/shoes/clown_shoes/jester
item_path = /obj/item/clothing/shoes/clown_shoes/clown_jester_shoes
item_cost = 4000
Binary file added sound/effects/clown_jingle1.ogg
Binary file not shown.
Binary file added sound/effects/clown_jingle2.ogg
Binary file not shown.
Binary file added sound/effects/jingle.ogg
Binary file not shown.

0 comments on commit ea1018d

Please sign in to comment.