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

Green Beret sprite fix #5566

Merged
merged 6 commits into from
Jan 31, 2024
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: 1 addition & 1 deletion code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)

/datum/gear/headwear/uscm/beret_green
display_name = "USCM beret, green"
path = /obj/item/clothing/head/beret/cm
path = /obj/item/clothing/head/beret/cm/green

/datum/gear/headwear/uscm/beret_tan
display_name = "USCM beret, tan"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
/obj/item/clothing/head/beret/cm/black
icon_state = "beret_black"

/obj/item/clothing/head/beret/cm/green
icon_state = "beret_green"

/obj/item/clothing/head/beret/cm/squadberet
name = "USCM Squad Beret"
desc = "For those who want to show pride and have nothing to lose (in their head, at least)."
Expand Down
Binary file modified icons/mob/humans/onmob/head_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
Binary file not shown.
Loading