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

FORECON-LRRP low pop platoon #138

Merged
merged 41 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ce60847
1
AndroBetel Mar 6, 2024
7ac4aef
2
AndroBetel Mar 6, 2024
2978a51
3
AndroBetel Mar 6, 2024
29683e6
4
AndroBetel Mar 6, 2024
5cd0337
who couldve known
AndroBetel Mar 6, 2024
300b69c
Update rover.dmm
AndroBetel Mar 6, 2024
5a185f5
pipening
AndroBetel Mar 6, 2024
4923532
cooler_ds
AndroBetel Mar 6, 2024
55c44fe
more_ds_fixes
AndroBetel Mar 6, 2024
9cffabe
yeah that was a bad idea
AndroBetel Mar 6, 2024
235f01c
afew tweaks
AndroBetel Mar 6, 2024
2f4a149
easier than expected
AndroBetel Mar 6, 2024
1a612d6
woops
AndroBetel Mar 6, 2024
db98da6
annoying
AndroBetel Mar 6, 2024
790722b
tweaks+big pouches gone
AndroBetel Mar 6, 2024
1c14226
erm
AndroBetel Mar 6, 2024
0e0f411
Update rover.dmm
AndroBetel Mar 6, 2024
26a90f2
Update rover.dmm
AndroBetel Mar 6, 2024
fd4f937
Update rover.dmm
AndroBetel Mar 6, 2024
f7c944d
1
AndroBetel Mar 6, 2024
1d29900
spoke too soon
AndroBetel Mar 6, 2024
e8c819a
finishing for today
AndroBetel Mar 6, 2024
8a3cfd4
Update rover.dmm
AndroBetel Mar 6, 2024
d3045c3
Update rover.dmm
AndroBetel Mar 6, 2024
4c7993f
what the actualy fuck was that
AndroBetel Mar 7, 2024
1638005
hoo damn
AndroBetel Mar 7, 2024
addc81b
Update rover.dmm
AndroBetel Mar 7, 2024
63bf4da
this is stupid
AndroBetel Mar 7, 2024
3e1cd15
rto_icon
AndroBetel Mar 7, 2024
217aec7
fluff updates
AndroBetel Mar 7, 2024
13ba89e
Update rover.dmm
AndroBetel Mar 7, 2024
90e95f6
Merge branch 'master' into forecon_platoon
AndroBetel Mar 7, 2024
881526c
Update rover.dmm
AndroBetel Mar 7, 2024
a69c92a
Update rover.dmm
AndroBetel Mar 7, 2024
76be3a7
Merge branch 'forecon_platoon' of https://github.com/AndroBetel/PvE-C…
AndroBetel Mar 7, 2024
be57925
Update rover.dmm
AndroBetel Mar 7, 2024
51c2622
yep
AndroBetel Mar 9, 2024
51b35ce
Update rover.dmm
AndroBetel Mar 9, 2024
84df487
green mean marine
AndroBetel Mar 10, 2024
51487e5
woops
AndroBetel Mar 11, 2024
dba8e8d
lockers
AndroBetel Mar 11, 2024
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
8 changes: 8 additions & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define SQUAD_SOF "SOF"
#define SQUAD_CBRN "CBRN"
#define SQUAD_UPP "Red Dawn"
#define SQUAD_LRRP "Snake Eaters"

// Job name defines
#define JOB_SQUAD_MARINE "Rifleman"
Expand All @@ -32,6 +33,13 @@
#define JOB_SQUAD_SMARTGUN_UPP "UPP Machinegunner"
#define JOB_SO_UPP "UPP Platoon Commander"

#define JOB_SQUAD_TEAM_LEADER_FORECON "FORECON Assistant Squad Leader"
#define JOB_SQUAD_LEADER_FORECON "FORECON Squad Leader"
#define JOB_SQUAD_MEDIC_FORECON "FORECON Squad Corpsman"
#define JOB_SQUAD_RTO "Radio Telephone Operator"
#define JOB_SQUAD_MARINE_FORECON "FORECON Rifleman"
#define JOB_SQUAD_SMARTGUN_FORECON "FORECON Smartgunner"

var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST

#define JOB_COLONIST "Colonist"
Expand Down
5 changes: 3 additions & 2 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)
var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP)
var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO)
var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP)

//Groundside roles
var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)
Expand All @@ -140,6 +140,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR
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_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
1 change: 1 addition & 0 deletions code/__DEFINES/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
#define DROPSHIP_ALAMO "dropship_alamo"
#define DROPSHIP_NORMANDY "dropship_normandy"
#define DROPSHIP_UPP "dropship_upp"
#define DROPSHIP_CYCLONE "dropship_cyclone"

#define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
#define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
Expand Down
1 change: 1 addition & 0 deletions code/datums/factions/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
if(JOB_INTEL) marine_rk = "io"
if(JOB_DROPSHIP_CREW_CHIEF) marine_rk = "dcc"
if(JOB_CREWMAN) marine_rk = "tc"
if(JOB_SQUAD_RTO) marine_rk = "rto"
if(JOB_MARINE_RAIDER) marine_rk = "soc"
if(JOB_MARINE_RAIDER_SL) marine_rk = "soctl"
if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd"
Expand Down
14 changes: 14 additions & 0 deletions code/game/area/Sulaco.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@
return FALSE
return TRUE

/area/shuttle/cyclone
name = "dropship Cyclone"
icon_state = "shuttlered"
base_muffle = MUFFLE_HIGH
soundscape_interval = 30
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL

/area/shuttle/cyclone/Enter(atom/movable/O, atom/oldloc)
if(istype(O, /obj/structure/barricade))
return FALSE
return TRUE


//DISTRESS SHUTTLES

/area/shuttle/distress
Expand Down
14 changes: 11 additions & 3 deletions code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,20 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
/datum/job/marine/medic/ai = JOB_SQUAD_MEDIC,\
/datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER,
/datum/job/marine/smartgunner/ai = JOB_SQUAD_SMARTGUN,\
/datum/job/marine/standard/ai = JOB_SQUAD_MARINE), /datum/squad/marine/upp = list(/datum/job/command/bridge/ai/upp = JOB_SO,\
/datum/job/marine/standard/ai = JOB_SQUAD_MARINE), \
/datum/squad/marine/upp = list(/datum/job/command/bridge/ai/upp = JOB_SO,\
/datum/job/marine/leader/ai/upp = JOB_SQUAD_LEADER,\
/datum/job/marine/medic/ai/upp = JOB_SQUAD_MEDIC,\
/datum/job/marine/tl/ai/upp = JOB_SQUAD_TEAM_LEADER,
/datum/job/marine/smartgunner/ai/upp = JOB_SQUAD_SMARTGUN,\
/datum/job/marine/standard/ai/upp = JOB_SQUAD_MARINE)))
/datum/job/marine/standard/ai/upp = JOB_SQUAD_MARINE),\
/datum/squad/marine/forecon = list(/datum/job/marine/standard/ai/forecon = JOB_SQUAD_MARINE,\
/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,\
/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)))

GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI,\
/datum/squad/marine/upp = ROLES_AI_UPP))
/datum/squad/marine/upp = ROLES_AI_UPP,\
/datum/squad/marine/forecon = ROLES_AI_FORECON))
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 @@ -59,10 +59,20 @@ AddTimelock(/datum/job/marine/leader, list(
gear_preset = /datum/equipment_preset/uscm/leader/upp
gear_preset_secondary = /datum/equipment_preset/uscm/leader/upp/lesser_rank

/datum/job/marine/leader/ai/forecon
title = JOB_SQUAD_LEADER_FORECON
gear_preset = /datum/equipment_preset/uscm/leader/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/leader/forecon/lesser_rank

/obj/effect/landmark/start/marine/leader/upp
name = JOB_SQUAD_LEADER_UPP
squad = SQUAD_UPP
job = /datum/job/marine/leader/ai/upp

/obj/effect/landmark/start/marine/leader/forecon
name = JOB_SQUAD_LEADER_FORECON
squad = SQUAD_LRRP
job = /datum/job/marine/leader/ai/forecon

#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,10 +86,20 @@ AddTimelock(/datum/job/marine/medic, list(
gear_preset = /datum/equipment_preset/uscm/medic/upp
gear_preset_secondary = /datum/equipment_preset/uscm/medic/upp/lesser_rank

/datum/job/marine/medic/ai/forecon
title = JOB_SQUAD_MEDIC_FORECON
gear_preset = /datum/equipment_preset/uscm/medic/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/medic/forecon/lesser_rank

/obj/effect/landmark/start/marine/medic/upp
name = JOB_SQUAD_MEDIC_UPP
squad = SQUAD_UPP
job = /datum/job/marine/medic/ai/upp

/obj/effect/landmark/start/marine/medic/forecon
name = JOB_SQUAD_MEDIC_FORECON
squad = SQUAD_LRRP
job = /datum/job/marine/medic/ai/forecon

#undef LCPL_VARIANT
#undef CPL_VARIANT
12 changes: 12 additions & 0 deletions code/game/jobs/job/marine/squad/smartgunner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,22 @@ AddTimelock(/datum/job/marine/smartgunner, list(
gear_preset = /datum/equipment_preset/uscm/sg/upp
gear_preset_secondary = /datum/equipment_preset/uscm/sg/upp/lesser_rank

/datum/job/marine/smartgunner/ai/forecon
title = JOB_SQUAD_SMARTGUN_FORECON
total_positions = 1
spawn_positions = 1
gear_preset = /datum/equipment_preset/uscm/sg/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/sg/forecon/lesser_rank

/obj/effect/landmark/start/marine/smartgunner/upp
name = JOB_SQUAD_SMARTGUN_UPP
job = JOB_SQUAD_SMARTGUN_UPP
squad = SQUAD_UPP

/obj/effect/landmark/start/marine/smartgunner/forecon
name = JOB_SQUAD_SMARTGUN_FORECON
job = JOB_SQUAD_SMARTGUN_FORECON
squad = SQUAD_LRRP

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

/datum/job/marine/standard/ai/forecon
title = JOB_SQUAD_MARINE_FORECON
total_positions = 2
spawn_positions = 2
gear_preset = /datum/equipment_preset/uscm/pfc/forecon
gear_preset_secondary = /datum/equipment_preset/uscm/pfc/forecon/lesser_rank

/datum/job/marine/standard/ai/rto
total_positions = 1
spawn_positions = 1
title = JOB_SQUAD_RTO
gear_preset = /datum/equipment_preset/uscm/rto
gear_preset_secondary = /datum/equipment_preset/uscm/rto/lesser_rank

/obj/effect/landmark/start/marine/upp
name = JOB_SQUAD_MARINE_UPP
squad = SQUAD_UPP
job = /datum/job/marine/standard/ai/upp

/obj/effect/landmark/start/marine/forecon
name = JOB_SQUAD_MARINE_FORECON
squad = SQUAD_LRRP
job = /datum/job/marine/standard/ai/forecon

/obj/effect/landmark/start/marine/rto
name = JOB_SQUAD_RTO
squad = SQUAD_LRRP
job = /datum/job/marine/standard/ai/rto

#undef PVT_VARIANT
#undef PFC_VARIANT
11 changes: 11 additions & 0 deletions code/game/jobs/job/marine/squad/tl.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,20 @@ AddTimelock(/datum/job/marine/tl, list(
title = JOB_SQUAD_TEAM_LEADER_UPP
gear_preset = /datum/equipment_preset/uscm/tl/upp

/datum/job/marine/tl/ai/forecon
total_positions = 1
spawn_positions = 1
title = JOB_SQUAD_TEAM_LEADER_FORECON
gear_preset = /datum/equipment_preset/uscm/tl/forecon

/obj/effect/landmark/start/marine/tl/upp
name = JOB_SQUAD_TEAM_LEADER_UPP
squad = SQUAD_UPP
job = /datum/job/marine/tl/ai/upp

/obj/effect/landmark/start/marine/tl/forecon
name = JOB_SQUAD_TEAM_LEADER_FORECON
squad = SQUAD_LRRP
job = /datum/job/marine/tl/ai/forecon

#undef SGT_VARIANT
6 changes: 6 additions & 0 deletions code/game/jobs/job/marine/squad_info.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@
rank = "SqSgt"
if(JOB_SQUAD_LEADER)
rank = "PltSgt"
if(JOB_SQUAD_RTO)
rank = "RTO"
else
rank = ""
squad_info_data["fireteams"][team]["sqsgt"] += list("rank" = rank)
Expand Down Expand Up @@ -251,6 +253,8 @@
rank = "SqSgt"
if(JOB_SQUAD_LEADER)
rank = "PltSgt"
if(JOB_SQUAD_RTO)
rank = "RTO"
else
rank = ""
if(H.rank_fallback)
Expand Down Expand Up @@ -298,6 +302,8 @@
rank = "SqSgt"
if(JOB_SQUAD_LEADER)
rank = "PltSgt"
if(JOB_SQUAD_RTO)
rank = "RTO"
else
rank = ""
mar[H.real_name] += list("rank" = rank)
Expand Down
14 changes: 14 additions & 0 deletions code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@

RegisterSignal(SSdcs, COMSIG_GLOB_PLATOON_NAME_CHANGE, PROC_REF(rename_platoon))

/datum/squad/marine/forecon
name = SQUAD_LRRP
access = list(ACCESS_MARINE_ALPHA)
radio_freq = SOF_FREQ
use_stripe_overlay = FALSE
equipment_color = "#32CD32"
chat_color = "#32CD32"
minimap_color = "#32CD32"
usable = TRUE

/datum/squad/marine/bravo
name = SQUAD_MARINE_2
equipment_color = "#ffc32d"
Expand Down Expand Up @@ -551,6 +561,8 @@

if(GET_DEFAULT_ROLE(M.job) == JOB_SQUAD_LEADER) //field promoted SL don't count as real ones
num_leaders++
if(JOB_SQUAD_RTO)
assignment = JOB_SQUAD_RTO

if(JOB_MARINE_RAIDER)
assignment = JOB_MARINE_RAIDER
Expand Down Expand Up @@ -678,6 +690,8 @@
if(JOB_SQUAD_LEADER)
if(!leader_killed)
old_lead.comm_title = "PltSgt"
if(JOB_SQUAD_RTO)
old_lead.comm_title = "RTO"
if(JOB_MARINE_RAIDER)
old_lead.comm_title = "Op."
if(JOB_MARINE_RAIDER_SL)
Expand Down
10 changes: 10 additions & 0 deletions code/game/jobs/role_authority.dm
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,16 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
lowest = S
else if(S.num_smartgun < lowest.num_smartgun)
lowest = S

if(JOB_SQUAD_RTO)
for(var/datum/squad/S in mixed_squads)
if(S.usable && S.roundstart)
if(pref_squad_name && S.name == pref_squad_name)
S.put_marine_in_squad(H) //fav squad has a spot for us.
return

if(!lowest)
lowest = S
if(!lowest)
var/ranpick = rand(1,4)
lowest = mixed_squads[ranpick]
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 @@ -277,3 +277,62 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list(

/obj/structure/machinery/cm_vending/clothing/medic/upp/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_upp_medic

GLOBAL_LIST_INIT(cm_vending_clothing_forecon_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/under/marine/medic/standard, /obj/item/clothing/shoes/marine/jungle/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/sof/survivor_forecon), 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/standard, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("M3-R Armor", 0, /obj/item/clothing/suit/storage/marine/rto/forecon, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),

list("BACKPACK (CHOOSE 1)", 0, null, null, null),
list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic/standard, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Medical Satchel", 0, /obj/item/storage/backpack/marine/satchel/medic/standard, 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/standard, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3/standard, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/standard/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 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44/standard, 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("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("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, 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/forecon
name = "\improper ColMarTech FORECON Medical Gear Rack"

/obj/structure/machinery/cm_vending/clothing/medic/forecon/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_forecon_medic
Loading
Loading