Skip to content

Commit

Permalink
sea vendor additions (and CPR dummy removal) (#6221)
Browse files Browse the repository at this point in the history
# About the pull request
these are some requested edits to the SEA vendor.

- adds an eyewear category with:
  - welding goggles
  - medhuds
   - prescription medhuds
  - sunglasses

- adds a gloves category with
   - insuls
  - marine combat gloves

- makes the SEA vendor's utility holster rig spawn full

- removes the CPR dummy since it's reportedly not useful

tested

# Explain why it's good for the game

these were requested by SEA players to help with some roles
works through part of this list:

![image](https://github.com/cmss13-devs/cmss13/assets/29965103/50bdea25-1393-4e20-9938-4d1be4f17fd5)

notably:
- i dont know what would be needed for either of the kits
- i dont know how to do the trackers

# Testing Photographs and Procedure

![image](https://github.com/cmss13-devs/cmss13/assets/29965103/53d06f19-860d-4d38-a2b6-7247da693862)


# Changelog
:cl:
add: Added eyewear options, more glove options to the SEA vendor
add: SEAs now get full versions of the utility holster belt
del: Removed the CPR dummy from the SEA vendor
/:cl:

---------

Co-authored-by: nefarious <[email protected]>
  • Loading branch information
ColdIronWarrior and nefarious committed May 3, 2024
1 parent 53cd988 commit 1c48301
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions code/game/machinery/vending/vendor_types/crew/sea.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@ GLOBAL_LIST_INIT(cm_vending_gear_sea, list(
GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Officer Uniform", 0, /obj/item/clothing/under/marine/dress, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),

list("GLOVES (CHOOSE 1)", 0, null, null, null),
list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),
list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),

list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),

list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
Expand All @@ -58,6 +61,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("Bulletproof Vest", 0, /obj/item/clothing/suit/armor/bulletproof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),

list("EYEWEAR (CHOOSE 1)", 0, null, null, null),
list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),

list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
Expand All @@ -68,9 +77,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("HEADWEAR (CHOOSE 1)", 0, null, null, null),
list("Drill Hat", 0, /obj/item/clothing/head/drillhat, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("M10 Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),

list("TOOLS OF THE TRADE", 0, null, null, null),
list("CPR Dummy", 5, /obj/item/cpr_dummy, null, VENDOR_ITEM_REGULAR)
))

/obj/structure/machinery/cm_vending/clothing/sea
Expand Down

0 comments on commit 1c48301

Please sign in to comment.