Skip to content

Commit

Permalink
Harlequin
Browse files Browse the repository at this point in the history
New Clothes for Clown and Mime
  • Loading branch information
Snack-Max committed Mar 9, 2024
1 parent dba44c6 commit a54b893
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
/obj/item/clothing/head/costume/cueball = 1,
/obj/item/clothing/under/suit/white_on_white = 1,
/obj/item/clothing/head/tragic = 2,
/obj/item/clothing/head/harlequinhat =2,//MONKESTATION EDIT ADDITION
/obj/item/clothing/under/costume/harlequin =2,//MONKESTATION EDIT ADDITION
/obj/item/clothing/under/costume/tragic = 2,
/obj/item/clothing/under/costume/streetmime = 1,
/obj/item/clothing/mask/gas/clown_hat/yellow = 1,
Expand Down
7 changes: 7 additions & 0 deletions monkestation/code/modules/clothing/head/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "milkman_hat"

/obj/item/clothing/head/harlequinhat
name = "harlequin hat"
desc = "I wear officer I'm not a pirate!"
icon = 'monkestation/icons/obj/clothing/hats.dmi'
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "harlequin_hat"

/obj/item/clothing/head/guardmanhelmet
name = "guardman's helmet"
desc = "Keeps your brain intact when fighting heretics"
Expand Down
8 changes: 8 additions & 0 deletions monkestation/code/modules/clothing/under/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@
alternate_worn_layer = GLOVES_LAYER
can_adjust = FALSE

/obj/item/clothing/under/costume/harlequin
name = "harlequin jumpsuit"
desc = "This is what you wear if you wanna be a weird fusion of a clown and mime."
icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
icon_state = "harlequin"
can_adjust = FALSE

/obj/item/clothing/under/costume/bee
name = "bee hide costume"
desc = "A suit made of beehide"
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.
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5635,13 +5635,13 @@
#include "interface\interface.dm"
#include "interface\menu.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"

Check failure on line 5638 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters

DME Validator

The include at line 5638 is out of order (#include "interface\skin.dmf", expected #include "interface\fonts\fonts_datum.dm")
#include "interface\fonts\fonts_datum.dm"
#include "interface\fonts\grand_9k.dm"
#include "interface\fonts\pixellari.dm"
#include "interface\fonts\spess_font.dm"
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
#include "interface\skin.dmf"
#include "monkestation\code\__DEFINES\projectile.dm"
#include "monkestation\code\__HELPERS\_lists.dm"
#include "monkestation\code\__HELPERS\anime.dm"
Expand Down

0 comments on commit a54b893

Please sign in to comment.