Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DNM] [TM ONLY] shrapnel fun #432

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define SQUAD_CBRN "CBRN"
#define SQUAD_UPP "Red Dawn"
#define SQUAD_LRRP "Snake Eaters"
#define SQUAD_HEFA "Path of Shrapnel"

// Job name defines
#define JOB_SQUAD_MARINE "Rifleman"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
var/global/list/ROLES_AI_HEFA = list("Comandor", "Hospitalier", "Prior", "Militant", "Knight", "Magister")
var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
//Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
Expand Down
3 changes: 3 additions & 0 deletions code/controllers/subsystem/communications.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ var/const/CHARLIE_FREQ = 1493
var/const/DELTA_FREQ = 1494
var/const/ECHO_FREQ = 1495
var/const/CRYO_FREQ = 1496
var/const/HEFA_FREQ = 1497

//Civilian channels
var/const/COLONY_FREQ = 1469
Expand Down Expand Up @@ -164,6 +165,7 @@ var/list/radiochannels = list(
SQUAD_MARINE_CRYO = CRYO_FREQ,
SQUAD_SOF = SOF_FREQ,
SQUAD_CBRN = CBRN_FREQ,
SQUAD_HEFA = HEFA_FREQ,

RADIO_CHANNEL_ALAMO = DS1_FREQ,
RADIO_CHANNEL_NORMANDY = DS2_FREQ,
Expand Down Expand Up @@ -269,6 +271,7 @@ SUBSYSTEM_DEF(radio)
"[HC_FREQ]" = "hcradio",
"[PVST_FREQ]" = "pvstradio",
"[COLONY_FREQ]" = "deptradio",
"[HEFA_FREQ]" = "bravoradio",
)

/datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)
Expand Down
19 changes: 19 additions & 0 deletions code/datums/ammo/shrapnel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,22 @@
damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects.
penetration = ARMOR_PENETRATION_TIER_8
accuracy = HIT_ACCURACY_TIER_MAX

/datum/ammo/bullet/shrapnel/hefa
penetration = ARMOR_PENETRATION_TIER_1

bonus_projectiles_type = /datum/ammo/bullet/shrapnel/spread
bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3

/datum/ammo/bullet/shrapnel/spread
scatter = SCATTER_AMOUNT_TIER_5
damage = 10
penetration = 0

/datum/ammo/bullet/shrapnel/spread/on_bullet_generation(obj/projectile/generated_projectile, mob/bullet_generator) //NOT used on New(), applied to the projectiles.
. = ..()
generated_projectile.apply_bullet_trait(/datum/element/bullet_trait_iff, list(FACTION_USCM, FACTION_HEFA))

/datum/ammo/bullet/shrapnel/metal/hefa
penetration = ARMOR_PENETRATION_TIER_9
shell_speed = AMMO_SPEED_TIER_2
1 change: 1 addition & 0 deletions code/datums/paygrades/factions/civillian/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/datum/paygrade/civilian/civilian
paygrade = "C"
name = "Civilian"
prefix = "Civilian"

/datum/paygrade/civilian/nurse
paygrade = "CN"
Expand Down
39 changes: 39 additions & 0 deletions code/datums/paygrades/factions/other/hefa.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/datum/paygrade/hefa
name = "HEFA Order Paygrade"
pay_multiplier = 1.5

/datum/paygrade/hefa/knight
paygrade = "Kni"
name = "Knight"
prefix = "Knight"
pay_multiplier = 1

/datum/paygrade/hefa/militant
paygrade = "Mil"
name = "Militant"
prefix = "Militant"
pay_multiplier = 1.5

/datum/paygrade/hefa/hospitalier
paygrade = "Hos"
name = "Hospitalier"
prefix = "Hospitalier"
pay_multiplier = 1.5

/datum/paygrade/hefa/prior
paygrade = "Pri"
name = "Prior"
prefix = "Prior"
pay_multiplier = 2

/datum/paygrade/hefa/comandor
paygrade = "Com"
name = "Comandor"
prefix = "Comandor"
pay_multiplier = 2.5

/datum/paygrade/hefa/magister
paygrade = "Mag"
name = "Magister"
prefix = "Magister"
pay_multiplier = 3
7 changes: 7 additions & 0 deletions code/datums/paygrades/helper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
NP = "Mr. "
else
NP = "Mx. " //inclusivity win!
if(P.prefix == "Knight")
if(gender && gender == FEMALE)
NP = "Sister "
else if(gender && gender == MALE)
NP = "Brother "
else
NP = "Sibling " //inclusivity win!
return NP
else
if(!P)//For custom admin-made paygrades to not cause runtimes.
Expand Down
11 changes: 9 additions & 2 deletions code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,15 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
/datum/job/marine/leader/ai/forecon = JOB_SQUAD_LEADER,\
/datum/job/marine/medic/ai/forecon = JOB_SQUAD_MEDIC,\
/datum/job/marine/tl/ai/forecon = JOB_SQUAD_TEAM_LEADER,\
/datum/job/marine/smartgunner/ai/forecon = JOB_SQUAD_SMARTGUN)))
/datum/job/marine/smartgunner/ai/forecon = JOB_SQUAD_SMARTGUN),\
/datum/squad/marine/hefa = list(/datum/job/command/bridge/ai/hefa = JOB_SO,\
/datum/job/marine/leader/ai/hefa = JOB_SQUAD_LEADER,\
/datum/job/marine/medic/ai/hefa = JOB_SQUAD_MEDIC,\
/datum/job/marine/tl/ai/hefa = JOB_SQUAD_TEAM_LEADER,
/datum/job/marine/smartgunner/ai/hefa = JOB_SQUAD_SMARTGUN,\
/datum/job/marine/standard/ai/hefa = JOB_SQUAD_MARINE)))

GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI,\
/datum/squad/marine/upp = ROLES_AI_UPP,\
/datum/squad/marine/forecon = ROLES_AI_FORECON))
/datum/squad/marine/forecon = ROLES_AI_FORECON,\
/datum/squad/marine/hefa = ROLES_AI_HEFA))
9 changes: 9 additions & 0 deletions code/game/jobs/job/command/cic/staffofficer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,19 @@ OverrideTimelock(/datum/job/command/bridge, list(
gear_preset = /datum/equipment_preset/uscm_ship/so/upp
gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp/lesser_rank

/datum/job/command/bridge/ai/hefa
title = "Magister"
gear_preset = /datum/equipment_preset/uscm_ship/so/hefa
gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/hefa

/obj/effect/landmark/start/bridge/upp
name = JOB_SO_UPP
icon_state = "so_spawn"
job = /datum/job/command/bridge/ai/upp

/obj/effect/landmark/start/bridge/hefa
name = "Magister"
job = /datum/job/command/bridge/ai/hefa

#undef SECOND_LT_VARIANT
#undef FIRST_LT_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/leader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ OverrideTimelock(/datum/job/marine/leader, list(
gear_preset = /datum/equipment_preset/uscm/leader/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/leader/forecon/lesser_rank

/datum/job/marine/leader/ai/hefa
title = "Comandor"
gear_preset = /datum/equipment_preset/uscm/leader/hefa
gear_preset_secondary = /datum/equipment_preset/uscm/leader/hefa

/obj/effect/landmark/start/marine/leader/upp
name = JOB_SQUAD_LEADER_UPP
squad = SQUAD_UPP
Expand All @@ -75,5 +80,10 @@ OverrideTimelock(/datum/job/marine/leader, list(
squad = SQUAD_LRRP
job = /datum/job/marine/leader/ai/forecon

/obj/effect/landmark/start/marine/leader/hefa
name = "Comandor"
squad = SQUAD_HEFA
job = /datum/job/marine/leader/ai/hefa

#undef SSGT_VARIANT
#undef GYSGT_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/medic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
gear_preset = /datum/equipment_preset/uscm/medic/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/medic/forecon/lesser_rank

/datum/job/marine/medic/ai/hefa
title = "Hospitalier"
gear_preset = /datum/equipment_preset/uscm/medic/hefa
gear_preset_secondary = /datum/equipment_preset/uscm/medic/hefa

/obj/effect/landmark/start/marine/medic/upp
name = JOB_SQUAD_MEDIC_UPP
squad = SQUAD_UPP
Expand All @@ -96,5 +101,10 @@
squad = SQUAD_LRRP
job = /datum/job/marine/medic/ai/forecon

/obj/effect/landmark/start/marine/medic/hefa
name = "Hospitalier"
squad = SQUAD_HEFA
job = /datum/job/marine/medic/ai/hefa

#undef LCPL_VARIANT
#undef CPL_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/smartgunner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
gear_preset = /datum/equipment_preset/uscm/sg/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/sg/forecon/lesser_rank

/datum/job/marine/smartgunner/ai/hefa
title = "Militant"
gear_preset = /datum/equipment_preset/uscm/sg/hefa
gear_preset_secondary = /datum/equipment_preset/uscm/sg/hefa

/obj/effect/landmark/start/marine/smartgunner/upp
name = JOB_SQUAD_SMARTGUN_UPP
job = JOB_SQUAD_SMARTGUN_UPP
Expand All @@ -94,5 +99,10 @@
job = JOB_SQUAD_SMARTGUN_FORECON
squad = SQUAD_LRRP

/obj/effect/landmark/start/marine/smartgunner/hefa
name = "Militant"
job = /datum/job/marine/smartgunner/ai/hefa
squad = SQUAD_HEFA

#undef LCPL_VARIANT
#undef CPL_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
gear_preset = /datum/equipment_preset/uscm/rto
gear_preset_secondary = /datum/equipment_preset/uscm/rto/lesser_rank

/datum/job/marine/standard/ai/hefa
title = "Knight"
gear_preset = /datum/equipment_preset/uscm/pfc/hefa
gear_preset_secondary = /datum/equipment_preset/uscm/pfc/hefa

/obj/effect/landmark/start/marine/upp
name = JOB_SQUAD_MARINE_UPP
squad = SQUAD_UPP
Expand All @@ -92,5 +97,10 @@
squad = SQUAD_LRRP
job = /datum/job/marine/standard/ai/rto

/obj/effect/landmark/start/marine/hefa
name = "Knight"
squad = SQUAD_HEFA
job = /datum/job/marine/standard/ai/hefa

#undef PVT_VARIANT
#undef PFC_VARIANT
9 changes: 9 additions & 0 deletions code/game/jobs/job/marine/squad/tl.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
title = JOB_SQUAD_TEAM_LEADER_FORECON
gear_preset = /datum/equipment_preset/uscm/tl/forecon

/datum/job/marine/tl/ai/hefa
title = "Prior"
gear_preset = /datum/equipment_preset/uscm/tl/hefa

/obj/effect/landmark/start/marine/tl/upp
name = JOB_SQUAD_TEAM_LEADER_UPP
squad = SQUAD_UPP
Expand All @@ -61,4 +65,9 @@
squad = SQUAD_LRRP
job = /datum/job/marine/tl/ai/forecon

/obj/effect/landmark/start/marine/tl/hefa
name = "Prior"
squad = SQUAD_HEFA
job = /datum/job/marine/tl/ai/hefa

#undef SGT_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,16 @@
minimap_color = "#32CD32"
usable = TRUE

/datum/squad/marine/hefa
name = SQUAD_HEFA
access = list(ACCESS_MARINE_ALPHA)
radio_freq = HEFA_FREQ
use_stripe_overlay = FALSE
equipment_color = "#ffc32d"
chat_color = "#ffe650"
minimap_color = "#ffc32d"
usable = TRUE

/datum/squad/marine/bravo
name = SQUAD_MARINE_2
equipment_color = "#ffc32d"
Expand Down
59 changes: 59 additions & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,65 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list(
/obj/structure/machinery/cm_vending/clothing/medic/forecon/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_forecon_medic

GLOBAL_LIST_INIT(cm_vending_clothing_hefa_medic, list(
list("MEDICAL SET (MANDATORY)", 0, null, null, null),
list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),

list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Standard Marine Apparel", 0, list(/obj/item/clothing/gloves/marine, /obj/item/clothing/head/helmet/marine/specialist/hefa), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Combat Sterile Gloves", 0, /obj/item/clothing/gloves/marine/medical, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("Medium Armor", 0, /obj/item/clothing/suit/storage/marine/medium, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
list("Heavy Armor", 0, /obj/item/clothing/suit/storage/marine/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),

list("BACKPACK (CHOOSE 1)", 0, null, null, null),
list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Medical Satchel", 0, /obj/item/storage/backpack/marine/satchel/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED),

list("BELT (CHOOSE 1)", 0, null, null, null),
list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, 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 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),

list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, 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_RECOMMENDED),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))

/obj/structure/machinery/cm_vending/clothing/medic/hefa/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_hefa_medic


// Chemical vendor

Expand Down
Loading
Loading