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

Ports ERT features #11415

Merged
merged 13 commits into from
Nov 27, 2024
Merged

Ports ERT features #11415

merged 13 commits into from
Nov 27, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Sep 1, 2024

About The Pull Request

This adds a bunch of features from TG, including:

  • Spawning in the briefing admin with the ERT squad, rather than having to spawn yourself in separately as a commander
  • Admins can now force ERT squad creator to pick the most experienced player (via hours) to be the Team Leader.
  • Admins can now force ERT squad creator to randomize ERT squad names
  • Adds several Unarmed variants of ERTs to pick from
  • Centcom Officials are ERT subtypes now
  • Adds new ERTs in the form of Nanotrasen-contracted Bounty Hunters!

Ports several PRs from TG:

Why It's Good For The Game

More options for Admin ERTs

Testing Photographs and Procedure

Screenshots&Videos

Screenshot 2024-09-01 133958

Changelog

🆑 rkz, Ryll/Shaps, Tralezab, Zonespace27
admin: ERTs now spawn with their briefing officer (the admin)
admin: Admins can now force the most experienced player to be team leader in an ERT
admin: Admins can now force randomize names in an ERT
code: adds and fixes a few ERT subtypes
tweak: all ERTs now have mindshield (no rev centcom lmao)
/:cl:

@github-actions github-actions bot added Mapping DMM Change Administration TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 labels Sep 1, 2024
@JixS4v
Copy link
Contributor

JixS4v commented Sep 3, 2024

This is one letter off from getting keyed

@Tsar-Salat
Copy link
Contributor Author

This is one letter off from getting keyed

Damn, that was funny the first 1000 times it was said.

Guess you're unlucky number 1001.

@JixS4v
Copy link
Contributor

JixS4v commented Sep 4, 2024

This is one letter off from getting keyed

Damn, that was funny the first 1000 times it was said.

Guess you're unlucky number 1001.

so mean, i'm removing your perms

Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Nov 27, 2024
Merged via the queue into BeeStation:master with commit ecf9e0e Nov 27, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Administration Code Improvement Feature Fix Mapping DMM Change Sprites TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants