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.

Sign up for GitHub

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

Jump to bottom

Rework USCM Specialist For HvH #6916

Closed
wants to merge 5 commits into from
Closed

Rework USCM Specialist For HvH #6916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83333ad
InitalCommit
Aug 10, 2024
d5cbd9c
ReworkSpec
Aug 11, 2024
72c2ad4
Glove
Aug 11, 2024
4c515a9
Update helmet.dm
Steelpoint Aug 13, 2024
65d7949
Update _marine_armor.dm
Steelpoint Aug 13, 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
3 changes: 2 additions & 1 deletion code/_globalvars/global_lists.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ GLOBAL_LIST_INIT(available_specialist_sets, list(
"Anti-materiel Sniper Set",
"Demolitionist Set",
"Heavy Grenadier Set",
"Pyro Set"
"Pyro Set",
"Heavy Armor Set (HvH Only)"
))

//Similar thing, but used in /obj/item/spec_kit
Expand Down
67 changes: 53 additions & 14 deletions code/game/machinery/vending/cm_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,25 +581,64 @@ GLOBAL_LIST_EMPTY(vending_products)
var/specialist_assignment
switch(p_name)
if("Scout Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SCOUT)
specialist_assignment = "Scout"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SCOUT)
specialist_assignment = "Scout"
if("Sniper Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SNIPER)
specialist_assignment = "Sniper"
GLOB.available_specialist_sets -= "Anti-materiel Sniper Set"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SNIPER)
specialist_assignment = "Sniper"
GLOB.available_specialist_sets -= "Anti-materiel Sniper Set"
if("Anti-materiel Sniper Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SNIPER)
specialist_assignment = "Heavy Sniper"
GLOB.available_specialist_sets -= "Sniper Set"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SNIPER)
specialist_assignment = "Heavy Sniper"
GLOB.available_specialist_sets -= "Sniper Set"
if("Demolitionist Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ROCKET)
specialist_assignment = "Demo"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ROCKET)
specialist_assignment = "Demo"
if("Heavy Grenadier Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_GRENADIER)
specialist_assignment = "Grenadier"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_GRENADIER)
specialist_assignment = "Grenadier"
if("Pyro Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_PYRO)
specialist_assignment = "Pyro"
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
to_chat(user, SPAN_WARNING("You must pick Heavy Armor Specialist in HvH."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_PYRO)
specialist_assignment = "Pyro"
if("Heavy Armor Set (HvH Only)")
if(MODE_HAS_FLAG(MODE_INFESTATION))
to_chat(user, SPAN_WARNING("This is a HvH only kit. Pick another one."))
vend_fail()
return FALSE
else
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_KITTED)
specialist_assignment = "Specialist"
GLOB.available_specialist_sets += "Heavy Armor Set (HvH Only)"
else
to_chat(user, SPAN_WARNING("<b>Something bad occurred with [src], tell a Dev.</b>"))
vend_fail()
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list(
list("Scout Set", 0, /obj/item/storage/box/spec/scout, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
list("Sniper Set", 0, /obj/item/storage/box/spec/sniper, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
list("Anti-materiel Sniper Set", 0, /obj/item/storage/box/spec/sniper/anti_materiel, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
list("Heavy Armor Set (HvH Only)", 0, /obj/item/storage/box/spec/B18, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),

list("EXTRA SCOUT AMMUNITION", 0, null, null, null),
list("A19 High Velocity Impact Magazine (10x24mm)", 40, /obj/item/ammo_magazine/rifle/m4ra/custom/impact, null, VENDOR_ITEM_REGULAR),
Expand Down
Loading