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

ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles #2395

Merged
merged 61 commits into from
Dec 12, 2023

Conversation

meemofcourse
Copy link
Contributor

About The Pull Request

Ports tgstation/tgstation#71348 and tgstation/tgstation#56345, with code adapted for Shiptest.

Also adds the following ERTs:

  • NT Loss Prevention
  • Frontiersmen
  • Inteq
  • Minutemen
    • Riot Control
    • BARD
    • GOLD Collector
  • Syndicate
    • Gorlex Maruders
    • Cybersun Commando
    • Cybersun Paramedic
  • SolGov
    • Sonnensoldner
    • Solarian Inspector

Why It's Good For The Game

adminbus funny

Changelog

🆑 Zonespace27, Ryll-Ryll, MeeMOfCourse
tweak: Admins can now spawn an unarmed horde of interns in addition to the old armed horde
tweak: Admins can toggle name randomization for ERT's, as well as if they'd like to be spawned in the briefing room at the time of creation
tweak: Admins can now force ERT's to pick the leader role from the most experienced candidates in terms of playtime
tweak: Menus like Create Response Team and Create Portal Storm now toggle boolean options when clicked, rather than open a popup window to select one of the two options
refactor: Centcom Officials are now a full subtype of ERT, rather than being a separate antagonist type with duplicated functionality
admin: ERTs can now have a custom shuttle that they can spawn on, on a toggle while creating said ERT.
admin: Shiptest-Specific ERTs, and respective files.
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Admin They do it for free. Code change Watch something violently break. labels Oct 4, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 15, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 15, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 21, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 22, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 25, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 28, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 16, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 18, 2023
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 18, 2023
@Admiral-Gigaton
Copy link

cant wait for an event where the admins just spawn like 8 pills total, load them with syndie/NT ERTs, and send them out to battle to the death

@thgvr
Copy link
Member

thgvr commented Nov 22, 2023

It seems fine in TMs but there's still some issues I believe with erts spawning at centcom. I'll take a thorough look this weekend.

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very good pr

@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Dec 12, 2023
Merged via the queue into shiptest-ss13:master with commit f244ba9 Dec 12, 2023
10 checks passed
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Dec 13, 2023
ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles (shiptest-ss13#2395)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin They do it for free. Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants