Skip to content

Commit

Permalink
Adds same hats available to Staff Officers to the ASO vendor (#6716)
Browse files Browse the repository at this point in the history
# About the pull request

ASO vendor now has a few more options for hats in their loadout. The
same options that are already provided to SOs. Specifically it gives
them access to the following hats that they previously didn't have as an
option:

- Beret, green
- Beret, tan
- Officer cap
- Service Peaked Cap

The only hat they had access to previously was the "patrol cap" and this
remains as an option for them to select.

# Explain why it's good for the game

More options for customizing appearance are good when it makes sense and
fits within uniform SOP. Given that ASO is a higher rank than SO and is
a shipside role with only a very niche case in which they would ever
deploy groundside, it makes sense to let them have a bit more
flexibility on their uniform appearance similar to other officers on the
ship.

# Testing Photographs and Procedure
<details>

Tested by building the code after this change and observing the ASO
vendor to see that new options appear. Confirmed that it only lets you
select one option and doesn't conflict with also letting you select a
helmet (same as how XO is handled).

<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/bd425a60-8acc-4c12-afb3-b15aa3c97c84)

Screenshot of vendor after selecting a single option for a hat.

</details>


# Changelog
:cl:
add: more options for hats to ASO vendor to bring it in line with what
SO has available
/:cl:
  • Loading branch information
rythenx authored Jul 25, 2024
1 parent 3eeccca commit 7d456c9
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list(
list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("BAG (CHOOSE 1)", 0, null, null, null),
Expand All @@ -463,6 +462,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list(
list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("M44 Custom Revolver", 0, /obj/item/storage/belt/gun/m44/custom, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),

list("HAT (CHOOSE 1)", 0, null, null, null),
list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Service Peaked Cap", 0, /obj/item/clothing/head/marine/peaked/service, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),

list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
Expand Down

0 comments on commit 7d456c9

Please sign in to comment.