Skip to content

Commit

Permalink
UPP squad selection (#7647)
Browse files Browse the repository at this point in the history
# About the pull request

adds eqivalent name var to squad, this allows to assing squads of other
factions to prefered USCM squad eqivalent aka charlie = cheka

# Explain why it's good for the game

UPP command will not have to spear marines manualy allows for UPP and in
future otehr faction squad RP and identity


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
qol: when lobby joining as UPP you getassigned to equivalen of prefered
USCM squad if possible
/:cl:

---------

Co-authored-by: vincibrv <[email protected]>
  • Loading branch information
cuberound and uuuuhuuuu authored Nov 26, 2024
1 parent 29999e7 commit 6622576
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
/datum/squad
/// Name of the squad
var/name
/// Equivalent name so that lobby prefered squad gets used for other factions
var/equivalent_name
/// Squads ID that is set on New()
var/tracking_id = null //Used for the tracking subsystem
/// Maximum number allowed in a squad. Defaults to infinite
Expand Down Expand Up @@ -271,21 +273,25 @@

/datum/squad/upp/one
name = SQUAD_UPP_1
equivalent_name = SQUAD_MARINE_1
equipment_color = "#e61919"
chat_color = "#e67d7d"

/datum/squad/upp/twp
/datum/squad/upp/two
name = SQUAD_UPP_2
equivalent_name = SQUAD_MARINE_2
equipment_color = "#ffc32d"
chat_color = "#ffe650"

/datum/squad/upp/three
name = SQUAD_UPP_3
equivalent_name = SQUAD_MARINE_3
equipment_color = "#c864c8"
chat_color = "#ff96ff"

/datum/squad/upp/four
name = SQUAD_UPP_4
equivalent_name = SQUAD_MARINE_4
equipment_color = "#4148c8"
chat_color = "#828cff"

Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/role_authority.dm
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
if(squad.put_marine_in_squad(human))
return

else if(squad.name == preferred_squad) //fav squad has a spot for us, no more searching needed.
else 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(squad.put_marine_in_squad(human))
return

Expand Down

0 comments on commit 6622576

Please sign in to comment.