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 Update #3383

Merged
merged 19 commits into from
Oct 22, 2024
Merged

ERT Update #3383

merged 19 commits into from
Oct 22, 2024

Conversation

meemofcourse
Copy link
Contributor

@meemofcourse meemofcourse commented Sep 17, 2024

About The Pull Request

This pull request is focused on ERTs. It does not add any ERT subshuttles. It does the following:

  • Removes the /centcom series of outfits (ERTs, dsquaddies, inspectors, and so on) because the system wasn't a subtype of job outfits and was Old. It does not remove their content.
  • Adds the outpost_access boolean to ERTs, which determines if ERT members should be given access to the outpost.
  • Does some Misc things:
    • Subtype of CM-15 mag with inc ammo.
    • Subtype of CM-5 mag with rubbershot ammo.
    • Changes up the loot in the ramzi commando outfit a bit.
    • Adds a bunch of subtypes of webbings with ammo.
    • Smokebombs no longer have dead memes in their desc.
  • Adds and changes a bunch of fucking ERTs:
    • Indies
      indie_erts
      • Deathsquad was moved to here. Also, they get a janitor and pizza delivery team, plus an EVA variant of the EMT team.
    • Roumain
      srm_erts
      • This was originally the primary focus of this PR. There's two teams to choose from:
        • A hunting party, composed of a Montagne, a Machinist, a Doctor, and some Hunters.
        • A defense militia, composed of a Montange, a Colligne, a Machinist, a Doctor, and some Hunters. The hunters this time have a variety of ouchy hurt guns, notably the Montange with a two-bore.
    • CLIP
      erts_clip
      • CLIP kind of stole the spotlight from Roumain, with a whopping 6 teams to choose from:
        • Standard team, with a Sergeant, Corpsman, Gunner, Engineer, and the common Minutemen. EVA Variant included.
        • An inspector. For your Inspector ERT needs.
        • A BARD Field Team, with some BARD Field Agents, so you can prove that damn poster wrong.
        • A BARD Emergency Team, with Fire, Medical, Xenofauna Specialists and Master Sergeant, so you can prove that damn poster right.
        • A C-MM Military Police team, with a riot variant, so you can keep safe all of the above.
        • A C-MM Media team, so you can take photos of all of the above.
    • Inteq
      inteq_erts
      • Inteq has three ERTs to choose from:
        • A run-of-the-mill team, composed of a Vanguard, Artificer, Corpsman, and some Enforcers. EVA variant.
        • A honor guard team, standing in as a military police team and defending any notable figures.
        • A mothership investigator. Inspector ERT.
    • SolGov
      erts_solcon
      • I didn't do much here. Inspector has some cooler gear, I suppose.
    • NGR
      syndie_erts
      • The NGR ERT got updated to use their up-to-date gear, of particular note the Marksman and Grenadier.
      • They also get an official for Inspector ERT Needs.
    • Cybersun
      • Cybersun wasn't touched much.
      • Brand new Hardliner ERT.
      • Cybersun Representative, Inspector ERT.
    • PGF
      erts_gezena
      • The PGF gets a standard team, with a Gunner, Medic, Engineer and Gunnery Sergeant.
      • There is a Federation Observer, which is the inspector ERT.
    • Ramzi
      • Ramzi has a single ERT to choose from. This basic team should not be underestimated; it has a Demolitionist with a rocket launcher, a Medic with combat simulants, a Leader with access to varying types of shotgun ammunition, and Cell Members with explosives to spare. If they know how to use their gear right, they might not die in a Vaquero airlock.
    • Fronties
      erts_fronties
      • The Frontiersmen now have four ERTs to choose from:
        • A basic team, with Illestern Riflemen and an Officer. There's an unarmed variant if you want to equip them yourself.
        • A raiding team, with Riflemen, an Engineer, a Medic, and an Officer. Balanced, probably.
        • Shock troops, with a Sentry, a Flametrooper, Shock Medic, Shock Officer, and SKM Riflemen. Finally, the sentries see some use.
        • A randomized team. The chances and equipment were reviewed a bit so you have more chances of getting something Fun instead of Nothing.
    • NT
      nt_erts
      • Practically every NT ERT has been killed off except a Vigilitas security team, an N+S delivery team, and CentCom's last stand - the inspector ERT.

Why It's Good For The Game

please play SRM

Changelog

🆑
add: A lot of ERTs and ERT remasters, including Fronties, Ramzi, PGF, NGR, Indies and whatnot
del: Most Nanotrasen ERTs have been shelved pending assets
del: Smokebomb randomized descriptions
/:cl:

@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 17, 2024
@github-actions github-actions bot removed the Sprites A bikeshed full of soulless bikes. label Sep 17, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
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 Sep 24, 2024
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Sep 24, 2024
@meemofcourse meemofcourse marked this pull request as ready for review October 6, 2024 20:31
@meemofcourse meemofcourse requested a review from a team as a code owner October 6, 2024 20:31
@meemofcourse
Copy link
Contributor Author

undrafted

Copy link
Contributor

github-actions bot commented Oct 7, 2024

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 7, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

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

looks good

@Sun-Soaked
Copy link
Member

resolve conflicts and I'll merge

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Oct 21, 2024
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, 2024
@Sun-Soaked Sun-Soaked enabled auto-merge October 22, 2024 19:57
@Sun-Soaked Sun-Soaked added this pull request to the merge queue Oct 22, 2024
Merged via the queue into shiptest-ss13:master with commit e954bb0 Oct 22, 2024
14 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This pull request is focused on ERTs. It does not add any ERT
subshuttles. It does the following:
* Removes the /centcom series of outfits (ERTs, dsquaddies, inspectors,
and so on) because the system wasn't a subtype of job outfits and was
Old. It does not remove their content.
* Adds the outpost_access boolean to ERTs, which determines if ERT
members should be given access to the outpost.
* Does some Misc things:
  * Subtype of CM-15 mag with inc ammo.
  * Subtype of CM-5 mag with rubbershot ammo.
  * Changes up the loot in the ramzi commando outfit a bit.
  * Adds a bunch of subtypes of webbings with ammo.
  * Smokebombs no longer have dead memes in their desc.
* Adds and changes a bunch of fucking ERTs:
  * Indies

![indie_erts](https://github.com/user-attachments/assets/4a6f52ac-591d-4189-bede-89ab41799f2b)
* Deathsquad was moved to here. Also, they get a janitor and pizza
delivery team, plus an EVA variant of the EMT team.
  * Roumain

![srm_erts](https://github.com/user-attachments/assets/d5299176-def8-4988-8814-c844216f0dc3)
* This was originally the primary focus of this PR. There's two teams to
choose from:
* A hunting party, composed of a Montagne, a Machinist, a Doctor, and
some Hunters.
* A defense militia, composed of a Montange, a Colligne, a Machinist, a
Doctor, and some Hunters. The hunters this time have a variety of ouchy
hurt guns, notably the Montange with a two-bore.
  * CLIP 

![erts_clip](https://github.com/user-attachments/assets/839eb885-7da8-4645-ac1f-12a410bd895e)
* CLIP kind of stole the spotlight from Roumain, with a whopping 6 teams
to choose from:
* Standard team, with a Sergeant, Corpsman, Gunner, Engineer, and the
common Minutemen. EVA Variant included.
      * An inspector. For your Inspector ERT needs.
* A BARD Field Team, with some BARD Field Agents, so you can prove that
damn poster wrong.
* A BARD Emergency Team, with Fire, Medical, Xenofauna Specialists and
Master Sergeant, so you can prove that damn poster right.
* A C-MM Military Police team, with a riot variant, so you can keep safe
all of the above.
      * A C-MM Media team, so you can take photos of all of the above.
  * Inteq

![inteq_erts](https://github.com/user-attachments/assets/44807c24-1c5b-462c-bd5c-525ac62fc6e8)
    * Inteq has three ERTs to choose from:
* A run-of-the-mill team, composed of a Vanguard, Artificer, Corpsman,
and some Enforcers. EVA variant.
* A honor guard team, standing in as a military police team and
defending any notable figures.
      * A mothership investigator. Inspector ERT.
  * SolGov

![erts_solcon](https://github.com/user-attachments/assets/8b0cd506-69aa-4ab9-a0a8-7425f659cff6)
    * I didn't do much here. Inspector has some cooler gear, I suppose. 
  * NGR

![syndie_erts](https://github.com/user-attachments/assets/02d90da3-f42a-4470-a3a9-a9db84fdf2f5)
* The NGR ERT got updated to use their up-to-date gear, of particular
note the Marksman and Grenadier.
    * They also get an official for Inspector ERT Needs.
  * Cybersun
    * Cybersun wasn't touched much.
    *  Brand new Hardliner ERT. 
    * Cybersun Representative, Inspector ERT.
  * PGF

![erts_gezena](https://github.com/user-attachments/assets/8e07f655-5222-4910-ba05-bc47bd28e252)
* The PGF gets a standard team, with a Gunner, Medic, Engineer and
Gunnery Sergeant.
    * There is a Federation Observer, which is the inspector ERT.
  * Ramzi
* Ramzi has a single ERT to choose from. This basic team should not be
underestimated; it has a Demolitionist with a rocket launcher, a Medic
with combat simulants, a Leader with access to varying types of shotgun
ammunition, and Cell Members with explosives to spare. If they know how
to use their gear right, they might not die in a Vaquero airlock.
  * Fronties

![erts_fronties](https://github.com/user-attachments/assets/8d32dd49-a3a3-4f14-b04e-3af181a47e6b)
    * The Frontiersmen now have four ERTs to choose from: 
* A basic team, with Illestern Riflemen and an Officer. There's an
unarmed variant if you want to equip them yourself.
* A raiding team, with Riflemen, an Engineer, a Medic, and an Officer.
Balanced, probably.
* Shock troops, with a Sentry, a Flametrooper, Shock Medic, Shock
Officer, and SKM Riflemen. Finally, the sentries see some use.
* A randomized team. The chances and equipment were reviewed a bit so
you have more chances of getting something Fun instead of Nothing.
  * NT

![nt_erts](https://github.com/user-attachments/assets/aaab7554-ca7b-4be3-b3a9-d8bad55d317a)
* Practically every NT ERT has been killed off except a Vigilitas
security team, an N+S delivery team, and CentCom's last stand - the
inspector ERT.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
please play SRM

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: A lot of ERTs and ERT remasters, including Fronties, Ramzi, PGF,
NGR, Indies and whatnot
del: Most Nanotrasen ERTs have been shelved pending assets
del: Smokebomb randomized descriptions
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: meem <[email protected]>
Co-authored-by: rye-rice <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants