Skip to content

Commit

Permalink
Green Beret sprite fix (#5566)
Browse files Browse the repository at this point in the history
# About the pull request

fixes #3573
Reuses existing rmc beret, which are green. it fits the beret theme, and
compared to red beret, it is a great match.

Please do note that black and red beret have weird sprites compared to
other beret. This is not the case when worn, however something to note.

# Explain why it's good for the game

Invisible sprites are bad
# Testing Photographs and Procedure

--Testing--

- Local Server
- Character Pref
- USMC beret, green
- spawn

<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/66401072/499032ca-822c-428d-9a20-bfce149f1e9b)


![image](https://github.com/cmss13-devs/cmss13/assets/66401072/09eb4694-6fdc-4c20-a042-47b608a72f79)


![image](https://github.com/cmss13-devs/cmss13/assets/66401072/d5ab6375-7a87-4798-8109-c0263bfc00aa)


![image](https://github.com/cmss13-devs/cmss13/assets/66401072/a5db5e77-aac3-4a51-afa4-91579db0bd96)

</details>


# Changelog
:cl:
fix: character pref Green Beret is no longer invisible
/:cl:
  • Loading branch information
Oyu07 authored Jan 31, 2024
1 parent 2cb1c76 commit 7f2d6bb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
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.

0 comments on commit 7f2d6bb

Please sign in to comment.