Skip to content

Commit

Permalink
Adds USCM Patch to Uniforms (#5868)
Browse files Browse the repository at this point in the history
# About the pull request
Adds the USCM ~and Falling Falcons~ patch automatically to vended
uniforms.

**EDIT: Per the Technical Manual as @morrowwolf shared, only the USCM
patch is added now.**

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

Get on the ready line Marines!

This is a straightforward PR imo, it looks cool and is lore accurate.

Like rank pins, the ~unit patch~ and USCM patch are a standard part of
the USCM uniform and all Marines aboard the Almayer would be wearing
one. This can be found in the movies as well as technical manuals for
the Marines. It also adds some “esprit de corp” for the Falling Falcons
USCM, now every player down to the newest one can take pride fighting
for liberty.

# Testing Photographs and Procedure

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


![image](https://github.com/cmss13-devs/cmss13/assets/32654903/f87847f8-12a1-4aff-85e0-d423b2669e61)

</details>


# Changelog

:cl:
NervanCatos
add: Uniforms vend with USCM patch.
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
  • Loading branch information
MobiusWon and Drulikar authored Mar 25, 2024
1 parent 607e936 commit 2b19672
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/game/machinery/vending/cm_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1275,12 +1275,15 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list(
if(vend_flags & VEND_UNIFORM_RANKS)
if(insignas_override)
var/obj/item/clothing/under/underclothes = new_item

//Gives ranks to the ranked
if(istype(underclothes) && user.wear_id && user.wear_id.paygrade)
var/rankpath = get_rank_pins(user.wear_id.paygrade)
if(rankpath)
var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath()
var/obj/item/clothing/accessory/patch/uscmpatch = new()
underclothes.attach_accessory(user, rank_insignia)
underclothes.attach_accessory(user, uscmpatch)

if(vend_flags & VEND_UNIFORM_AUTOEQUIP)
// autoequip
Expand Down

0 comments on commit 2b19672

Please sign in to comment.