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

Add Recolorable Wizard Hat to Autodrobe and Loadout! #3654

Closed
wants to merge 5 commits into from
Closed
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
10 changes: 10 additions & 0 deletions code/datums/greyscale/config_types/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1309,3 +1309,13 @@
name = "Worn Tassled Jacket"
icon_file = 'monkestation/icons/mob/clothing/neck.dmi'
json_config = 'code/datums/greyscale/json_configs/linjacket_worn.json'

/datum/greyscale_config/crew_wizhat
name = "Wizard Hat"
icon_file = 'monkestation/icons/obj/clothing/hats.dmi'
json_config = 'code/datums/greyscale/json_configs/crew_wizhat.json'

/datum/greyscale_config/crew_wizhat_worn
name = "Worn Wizard Hat"
icon_file = 'monkestation/icons/mob/clothing/head.dmi'
json_config = 'code/datums/greyscale/json_configs/crew_wizhat_worn.json'
10 changes: 10 additions & 0 deletions code/datums/greyscale/json_configs/crew_wizhat.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"crew_wizhat": [
{
"type": "icon_state",
"icon_state": "crew_wizhat",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
10 changes: 10 additions & 0 deletions code/datums/greyscale/json_configs/crew_wizhat_worn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"crew_wizhat": [
{
"type": "icon_state",
"icon_state": "crew_wizhat",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
2 changes: 1 addition & 1 deletion code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
/obj/item/clothing/head/costume/witchwig = 1,
/obj/item/staff/broom = 1,
/obj/item/clothing/suit/wizrobe/fake = 1,
/obj/item/clothing/head/wizard/fake = 1,
/obj/item/clothing/head/costume/crew_wizhat = 1,
/obj/item/staff = 3,
/obj/item/clothing/head/costume/shrine_wig = 1,
/obj/item/clothing/suit/costume/shrine_maiden = 1,
Expand Down
12 changes: 12 additions & 0 deletions monkestation/code/modules/clothing/head/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,15 @@ BUNNY EARS
/*
END OF BUNNY EARS
*/

/obj/item/clothing/head/costume/crew_wizhat
name = "wizard hat"
desc = "Just a regular wizard hat. There is nothing magical about this."
icon = 'monkestation/icons/obj/clothing/hats.dmi'
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "crew_wizhat"
worn_icon_state = "crew_wizhat"
greyscale_colors = "#555555"
greyscale_config = /datum/greyscale_config/crew_wizhat
greyscale_config_worn = /datum/greyscale_config/crew_wizhat_worn
flags_1 = IS_PLAYER_COLORABLE_1
6 changes: 3 additions & 3 deletions monkestation/code/modules/loadouts/items/heads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
name = "Griffon Head"
item_path = /obj/item/clothing/head/costume/griffin

/datum/loadout_item/head/wizard
name = "Wizard Hat"
item_path = /obj/item/clothing/head/wizard/fake
/datum/loadout_item/head/wizhat
name = "Colorable Wizard Hat"
item_path = /obj/item/clothing/head/costume/crew_wizhat

/datum/loadout_item/head/witch
name = "Witch Hat"
Expand Down
Binary file modified monkestation/icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/hats.dmi
Binary file not shown.
Loading