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

Squad Marines #7403

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Squad Marines #7403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions code/game/jobs/job/marine/squads.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
var/omni_squad_vendor = FALSE
/// Squad roles max caps per role list
var/list/roles_cap = list(
JOB_SQUAD_MARINE = null,
JOB_SQUAD_ENGI = 3,
JOB_SQUAD_MEDIC = 4,
JOB_SQUAD_SMARTGUN = 1,
Expand Down Expand Up @@ -189,6 +190,7 @@
prepend_squad_name_to_assignment = FALSE

roles_cap = list(
JOB_SQUAD_MARINE = null,
JOB_SQUAD_ENGI = 0,
JOB_SQUAD_MEDIC = 0,
JOB_SQUAD_SMARTGUN = 0,
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/role_authority.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou

var/datum/squad/lowest
for(var/datum/squad/squad in mixed_squads)
if(slot_check && !skip_limit)
if(slot_check && !isnull(squad.roles_cap[slot_check]) && !skip_limit)
if(squad.roles_in[slot_check] >= squad.roles_cap[slot_check])
continue

Expand Down
Loading