Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small But Knowing Clown #425

Merged
merged 4 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
/obj/item/clothing/under/suit/white_on_white = 1,
/obj/item/clothing/head/tragic = 2,
/obj/item/clothing/under/costume/tragic = 2,
/obj/item/clothing/head/knowingclown = 2,
/obj/item/clothing/under/knowingclown = 2,
),
),
list(
Expand Down
8 changes: 8 additions & 0 deletions monkestation/code/modules/clothing/head/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@
icon_state = "bee"
flags_inv = HIDEHAIR
worn_y_offset = 2

/obj/item/clothing/head/knowingclown
name = "Small but Knowing Clown hat"
desc = "The Cap of a Small but All Knowing Clown"
icon = 'monkestation/icons/obj/clothing/hats.dmi'
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "knowingclownhat"
worn_y_offset = 6
8 changes: 8 additions & 0 deletions monkestation/code/modules/clothing/under/undersuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
icon_state = "bloodred_pajamas"
can_adjust = FALSE

/obj/item/clothing/under/knowingclown
name = "Small But Knowing Clown suit"
desc = "Suit worn by a small but all knowing clown"
icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
icon_state = "knowing_clown"
can_adjust = FALSE

/obj/item/clothing/under/driscoll
name = "O'Driscoll outfit"
desc = "All you need now is a holster and six shooter..."
Expand Down
Binary file modified monkestation/icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified monkestation/icons/mob/clothing/uniform.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/uniforms.dmi
Binary file not shown.
Loading