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

FORECON Gear Preset + Admin ERT Addition #6364

Merged
merged 4 commits into from
Jul 9, 2024

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jun 2, 2024

About the pull request

Adds a set of FORECON gear presets set to simulate the FORECON marines, but properly equipped. Furthermore adds two admin only ERT's to summon a squad (6 people) or a platoon (30 people) of FORECON.

  • Adds a set of recon light armour for FORECON, has same defence as medium armour but light armour move speed.
  • Tactical attachment variant of the custom M4RA and regular M4RA that FORECON use
  • Adds squad settings for ERT FORECON

No changes to regular FORECON are made.

Explain why it's good for the game

The intention behind this is to give staff more tools to make use of FORECON in regular gameplay, either to spawn in individual FORECON marines or to send in FORECON ERT's for an event.

The PR does not add FORECON to the regular Distress Beacon pool.

Testing Photographs and Procedure

Screenshot 2024-06-03 02 37 06

Changelog

🆑
add: Marine force reconnaissance gear presets have been added for admin use.
add: ERT force reconnaissance have functional squad settings, including a squad colour (green) and a radio channel. These settings do not apply for survivor force reconnaissance marines.
add: A marine force reconnaissance distress signal has been added. Spawning either a 6-man squad, or a 30-man platoon. These are currently for admin use only.
add: A set of customized M3-R armour has been added for force reconnaissance marines. It has comparable defensive values to M3 armour but has the speed slowdown of M3-L armour. Only ERT force reconnaissance marines will spawn with this.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Jun 2, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 11, 2024
@Steelpoint
Copy link
Contributor Author

Since I heard someone mention it, this PR is not adding the FORECON armour to the regular FORECON spawns on Chances Claim, the armour is only for the ERT spawn.

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Jun 12, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 19, 2024
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jun 19, 2024
@Drulikar
Copy link
Contributor

Stale exempt until reviewed.

@harryob harryob added this pull request to the merge queue Jul 9, 2024
Merged via the queue into cmss13-devs:master with commit 5b11896 Jul 9, 2024
29 checks passed
cm13-github added a commit that referenced this pull request Jul 9, 2024
@Steelpoint Steelpoint deleted the FORECON branch July 9, 2024 17:51
@Skatuk
Copy link

Skatuk commented Jul 10, 2024

can you change the colour cause echo is already existant, maybe something like white
Also did notice a typo in light armour
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale Exempt PR can't go stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants