Skip to content

Commit

Permalink
Adds colorable cowboy hats and minor clothing fixes
Browse files Browse the repository at this point in the history
Adds two styles of colorable cowboy hat to loadout
Adds clear gas mask sprite for unathi to cover their full face
Fixes sash accessories to be properly colorable
  • Loading branch information
Nyarlthotep committed Jan 21, 2024
1 parent 2c55661 commit 5641b61
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 5 deletions.
27 changes: 22 additions & 5 deletions code/modules/client/preference_setup/loadout/loadout_head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,28 @@

/datum/gear/head/cowboy/New()
..()
var/list/hats = list()
for(var/hat in typesof(/obj/item/clothing/head/cowboy_hat))
var/obj/item/clothing/head/hat_type = hat
hats[initial(hat_type.name)] = hat_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hats))
var/list/hats = list(
"cowboy hat" = /obj/item/clothing/head/cowboy_hat,
"cowboy hat, black" = /obj/item/clothing/head/cowboy_hat/black,
"cowboy hat, wide" = /obj/item/clothing/head/cowboy_hat/wide,
"cowboy hat, small" = /obj/item/clothing/head/cowboy_hat/small,
)
gear_tweaks += new/datum/gear_tweak/path(hats)

/datum/gear/head/cowboy_colorable
display_name = "cowboy hat (colorable)"

description = "Draw. In any color of the rainbow."
path = /obj/item/clothing/head/cowboy_hat/white

/datum/gear/head/cowboy_colorable/New()
..()
var/list/whitehats = list(
"cowboy hat" = /obj/item/clothing/head/cowboy_hat/white,
"cowboy hat, wide" = /obj/item/clothing/head/cowboy_hat/white_wide,
)
gear_tweaks += new/datum/gear_tweak/path(whitehats)
gear_tweaks += gear_tweak_free_color_choice

/datum/gear/head/fedora
display_name = "fedora, brown"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,14 @@
desc = "Because justice isn't going to dispense itself."
icon_state = "cowboy_wide"

/obj/item/clothing/head/cowboy_hat/white
icon_state = "cowboy_white"

/obj/item/clothing/head/cowboy_hat/white_wide
name = "wide-brimmed cowboy hat"
desc = "Because justice isn't going to dispense itself."
icon_state = "cowboy_white_wide"

/obj/item/clothing/head/cowboy_hat/small
name = "small cowboy hat"
desc = "For the tiniest of cowboys."
Expand Down
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/species/unathi/mask.dmi
Binary file not shown.
Binary file modified icons/mob/ties.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.

0 comments on commit 5641b61

Please sign in to comment.