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

NGR Rework Part 1: Clothing and Roles! #2945

Merged
merged 8 commits into from
May 15, 2024

Conversation

Imaginos16
Copy link
Member

About The Pull Request

HELLO HELLO EVERYONE, IT'S THAT TIME OF THE YEAR AGAIN! ANOTHER FACTION REWORK LET'S GOOOO WOOOOO YEAH WOOOOO!

ON THE MENU TODAY: THE NEW GORLEX REPUBLIC!

image

This PR updates ALL the visuals of our favorite boys in beige. Sadly this does not include new ships, nor does this include new guns. You're gonna have to wait on that for now. This PR adds three new roles that are currently not in an NGR ship (the Hyena), which are:

  • The Operative (think of it like the Enforcer)
  • The Medical Doctor
  • The Lieutenant (Second-In-Command role)

The Junior Agent role has now been renamed to Initiate.

Any new equipment analogous to old equipment in the Hyena has been fully replaced, such as the old generic syndicate armor in favor of the new suits they now boast!

Why It's Good For The Game

The more reworked factions, the merrier!!!!

Changelog

🆑 PositiveEntropy
add The New Gorlex Republic's Second Battlegroup Fleet Now Boasts New Uniforms!
/:cl:

@Imaginos16 Imaginos16 requested review from a team as code owners April 29, 2024 05:16
@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. Code change Watch something violently break. labels Apr 29, 2024
@Imaginos16 Imaginos16 added the Test Merge Candidate You do it for free. label Apr 29, 2024
@lectronyx
Copy link

these are lovely! That shade of green is oddly captivating

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 2, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

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 May 2, 2024
//Jumpsuits//
/////////////

/obj/item/clothing/under/syndicate/ngr
Copy link
Member

Choose a reason for hiding this comment

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

any specific reason these are all syndicate/ subtype?

@thgvr thgvr added this pull request to the merge queue May 13, 2024
github-merge-queue bot pushed a commit that referenced this pull request May 13, 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

HELLO HELLO EVERYONE, IT'S THAT TIME OF THE YEAR AGAIN! ANOTHER FACTION
REWORK LET'S GOOOO WOOOOO YEAH WOOOOO!


ON THE MENU TODAY: THE NEW GORLEX REPUBLIC!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/b7790168-483a-4d69-9566-d13880d423de)

This PR updates ALL the visuals of our favorite boys in beige. Sadly
this does not include new ships, nor does this include new guns. You're
gonna have to wait on that for now. This PR adds three new roles that
are currently not in an NGR ship (the Hyena), which are:

- The Operative (think of it like the Enforcer)
- The Medical Doctor
- The Lieutenant (Second-In-Command role)

The Junior Agent role has now been renamed to Initiate.

Any new equipment analogous to old equipment in the Hyena has been fully
replaced, such as the old generic syndicate armor in favor of the new
suits they now boast!
<!-- 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
The more reworked factions, the merrier!!!!
<!-- 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: PositiveEntropy
add The New Gorlex Republic's Second Battlegroup Fleet Now Boasts New
Uniforms!
/: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. -->
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 13, 2024
@rye-rice rye-rice added this pull request to the merge queue May 15, 2024
Merged via the queue into shiptest-ss13:master with commit c820bcb May 15, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request May 19, 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

HELLO HELLO EVERYONE, IT'S THAT TIME OF THE YEAR AGAIN! ANOTHER FACTION
REWORK LET'S GOOOO WOOOOO YEAH WOOOOO!


ON THE MENU TODAY: THE NEW GORLEX REPUBLIC!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/b7790168-483a-4d69-9566-d13880d423de)

This PR updates ALL the visuals of our favorite boys in beige. Sadly
this does not include new ships, nor does this include new guns. You're
gonna have to wait on that for now. This PR adds three new roles that
are currently not in an NGR ship (the Hyena), which are:

- The Operative (think of it like the Enforcer)
- The Medical Doctor
- The Lieutenant (Second-In-Command role)

The Junior Agent role has now been renamed to Initiate.

Any new equipment analogous to old equipment in the Hyena has been fully
replaced, such as the old generic syndicate armor in favor of the new
suits they now boast!
<!-- 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
The more reworked factions, the merrier!!!!
<!-- 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: PositiveEntropy
add The New Gorlex Republic's Second Battlegroup Fleet Now Boasts New
Uniforms!
/: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. -->
@Imaginos16 Imaginos16 deleted the ngr-but-awesomer branch June 7, 2024 02:45
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. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants