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.

Sign up for GitHub

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

Jump to bottom

Marathon Armory Restock #34798

Merged
merged 3 commits into from
Feb 1, 2025
Merged

Marathon Armory Restock #34798

merged 3 commits into from
Feb 1, 2025

Conversation

Nox38
Copy link
Contributor

@Nox38 Nox38 commented Jan 31, 2025

About the PR

Updated the content of Marathon's armory and fixed a few QOL things in security. Increased max secoffs to 8.

Why / Balance

4 Officers is not enough for a station of that size, and the armory content wasn't very well balanced. New content:
3 Lecter, 3 Drozd, 3 Kammerer, 6 Laser, 4 Hardsuit, 4 Bulletproof, 4 Riot, 2 Reflective, 2 Jetpacks.

Media

Marathon-0

Requirements

Changelog
🆑

  • tweak: Set Marathon's max secoffs to 8.
  • tweak: Restocked Marathon's armory.
    -->

@ss14-map-server
Copy link

This PR contains new or changed maps:

  • marathon.yml

Maps are being rendered. This comment will be updated if rendering them is done.
01/31/25 21:09

@github-actions github-actions bot added Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. size/L Denotes a PR that changes 1000-4999 lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 31, 2025
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • marathon.yml

Maps are being rendered. This comment will be updated if rendering them is done.
01/31/25 21:21

@ss14-map-server
Copy link

This PR contains new or changed maps:

  • marathon.yml

Maps are being rendered. This comment will be updated if rendering them is done.
01/31/25 21:27

@Nox38 Nox38 marked this pull request as ready for review January 31, 2025 21:34
@Nox38 Nox38 requested a review from Emisse as a code owner January 31, 2025 21:34
@github-actions github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted label Jan 31, 2025
@Emisse Emisse merged commit 9e9c9b9 into space-wizards:master Feb 1, 2025
24 checks passed
@Nox38 Nox38 deleted the Marathon-armory-restock branch February 1, 2025 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Emisse Emisse Awaiting requested review from Emisse Emisse is a code owner

Assignees
No one assigned
Labels
Changes: Map Changes: Might require knowledge of mapping. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Nox38 @Emisse