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

Separates Factions In Observe/Follow Tab #5058

Merged
merged 4 commits into from
Dec 21, 2023

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Nov 28, 2023

About the pull request

Separates the factions from a generic 'ERT Faction' tab into their own separate one's for each of the main factions, this includes.

  • WY
  • UPP
  • CLF
  • Freelancers
  • Mercenaries
  • Contractors
  • Dutch's Dozen
  • TWE RMC
  • CMB Marshals

The remaining factions (mostly memes, unused or admin ones) are kept in the current 'ERT' panel.

Explain why it's good for the game

Better gauge as a observer who the present factions are, helps in the uncommon circumstances where multiple factions are in play.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Factions are now properly separated in the observe menu as a ghost.
/:cl:

@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Nov 28, 2023
@BadAtThisGame302
Copy link
Contributor

Will this also seperate the Liaison or the UPP survivors for example?

code/__DEFINES/mode.dm Show resolved Hide resolved
@Steelpoint
Copy link
Contributor Author

requested changes made

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

I am almost certain this will cause unintended behavior where this list is used here: https://github.com/cmss13-devs/cmss13/blob/master/code/__HELPERS/unsorted.dm#L676

As in I do not expect a FACTION_WY_DEATHSQUAD ert to add any of those mobs as candidates.

May be moot though because its usage is only in getertmembers which I see no references to.

@Drulikar Drulikar added Testmerge Candidate we'll test this while you're asleep and the server has 10 players and removed Testmerge Candidate we'll test this while you're asleep and the server has 10 players labels Dec 6, 2023
@Steelpoint
Copy link
Contributor Author

I'll update changes in a few days when I have the free time.

@Drulikar Drulikar marked this pull request as draft December 11, 2023 06:26
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 Dec 19, 2023
@Steelpoint
Copy link
Contributor Author

Death squad and WY PMC synths will now be separated. Other changes made. I did some testing and this seems to work. Survivors are still listed as survivors no matter what faction they belong to.

@Steelpoint Steelpoint marked this pull request as ready for review December 20, 2023 07:28
@Birdtalon Birdtalon removed the Stale beg a maintainer to review your PR label Dec 20, 2023
@Steelpoint
Copy link
Contributor Author

Steelpoint commented Dec 21, 2023

I might want to consider adding a separate category for USCM ERT's like Marsoc and CBRN since they fall under the regular Marine list. Also I should separate Provost.

Edit: Might break things if I try that, so it'll have to stay as it is.

@Drulikar Drulikar added this pull request to the merge queue Dec 21, 2023
Merged via the queue into cmss13-devs:master with commit df6fce4 Dec 21, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 21, 2023
@Steelpoint Steelpoint deleted the OpAssMap branch May 24, 2024 09:18
github-merge-queue bot pushed a commit that referenced this pull request Aug 12, 2024
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->
ERT factions no longer show up in the escape section.

This issue was caused by #5058

# Explain why it's good for the game
Makes it clearer who has actually escaped and not ERT returning to their
base.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: ERT no longer show up in the orbit escape section
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants