From 7d456c966bac24bf579ae477d69b837a2dec984a Mon Sep 17 00:00:00 2001 From: rythenx <90358236+rythenx@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:48:10 -0400 Subject: [PATCH] Adds same hats available to Staff Officers to the ASO vendor (#6716) # 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
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). Screenshots & Videos ![image](https://github.com/user-attachments/assets/bd425a60-8acc-4c12-afb3-b15aa3c97c84) Screenshot of vendor after selecting a single option for a hat.
# Changelog :cl: add: more options for hats to ASO vendor to bring it in line with what SO has available /:cl: --- .../vending/vendor_types/crew/senior_officers.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index c43d7e730d89..7157a56aa7f9 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -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), @@ -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),