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

improvement for cryo squad marines cryoning and some minor QOL for radnomiz_squad proc #7911

Merged
merged 6 commits into from
Jan 23, 2025
Merged

improvement for cryo squad marines cryoning and some minor QOL for radnomiz_squad proc #7911

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae13e80
if we started talking about opti... here we go
blackcrystall Dec 25, 2024
8062d78
remove shuffle and some lines remove
blackcrystall Dec 25, 2024
33a8974
we put our cryo techtree cryoned marines to somewhere... at least in …
blackcrystall Jan 9, 2025
6d12eb9
Merge branch 'master' into cope_min_Cope_time_to_do_skill_issue_again
blackcrystall Jan 9, 2025
6c5fdb1
В
blackcrystall Jan 9, 2025
7773754
Merge branch 'cope_min_Cope_time_to_do_skill_issue_again' of https://…
blackcrystall Jan 9, 2025
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
22 changes: 8 additions & 14 deletions code/game/jobs/role_authority.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,32 +545,26 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
for(var/datum/squad/squad in squads)
if(squad.roundstart && squad.usable && squad.faction == human.faction && squad.name != "Root")
mixed_squads += squad
mixed_squads = shuffle(mixed_squads)

var/preferred_squad
if(human?.client?.prefs?.preferred_squad)
preferred_squad = human.client.prefs.preferred_squad
var/preferred_squad = human.client?.prefs?.preferred_squad
if(preferred_squad == "None")
preferred_squad = null

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

if(squad.name == preferred_squad || squad.equivalent_name == preferred_squad) //fav squad or faction equivalent has a spot for us, no more searching needed.
if(preferred_squad && (squad.name == preferred_squad || squad.equivalent_name == preferred_squad)) //fav squad or faction equivalent has a spot for us, no more searching needed.
if(squad.put_marine_in_squad(human))
return

if(!lowest)
if(!lowest || (slot_check && lowest.roles_in[slot_check] > squad.roles_in[slot_check]))
lowest = squad

else if(slot_check)
if(squad.roles_in[slot_check] < lowest.roles_in[slot_check])
lowest = squad

if(!lowest || !lowest.put_marine_in_squad(human))
to_world("Warning! Bug in get_random_squad()!")
return
if(!lowest)
lowest = locate(/datum/squad/marine/cryo) in squads
lowest.put_marine_in_squad(human)
return

/datum/authority/branch/role/proc/get_caste_by_text(name)
Expand Down
Loading