Parity fixes for #40751 and remove unnecessary legal headers#427
Open
SnappingOpossum wants to merge 4 commits intoRonRonstation:masterfrom
Open
Parity fixes for #40751 and remove unnecessary legal headers#427SnappingOpossum wants to merge 4 commits intoRonRonstation:masterfrom
SnappingOpossum wants to merge 4 commits intoRonRonstation:masterfrom
Conversation
github-actions
bot
added
size/M
S: Untriaged
|
I was under the impression all timers would be bats; moreover some files like HoS mix bats and bare seconds, was this intentional? |
Author
|
I mostly just changed the ones that needed changes to avoid merge conflicts, since the rest should come with the next upstream merge anyway. |
SnappingOpossum
changed the title
Author
|
Honestly no clue why that test failed. |
Author
|
Anyway rewrote the name and comment to reflect what it actually does now, if you want anything about it or the PR itself changed let me know. |
github-actions
bot
added
the
S: Needs Review
arenaconspiracy
approved these changes
Oct 12, 2025
arenaconspiracy
left a comment
arenaconspiracy
left a comment
There was a problem hiding this comment.
PR does the thing.
We're still pending a discussion among admins/maints on what we want our time requirements to be, but it's probably fine to do that that in another PR.
If another maint approves this we can merge this as is.
arenaconspiracy
added
P2: Raised
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Time requirements changed in #237 have been reverted,Ronstation time requirements have been moved to bats,and CMO has been given a weight.Why / Balance
Arena asked me to replace the Ronstation time requirements with what they are upstream and clean up merge conflicts early to reduce workload on maintainers and make it easier to denote in a changelog.May be better to do changelog part another way nowRonstation specific time requirements (plushies, BSO, etc.) have been moved to bats for the same reasons as #40751.
CMO fix is both for a merge conflict and because it's a bug that managed to not get caught.Technical details
Time requirements for command roles and lawyer have been reverted to their upstream equivalent, with some being converted to bats.CMO has been given a weight from #37774 to avoid merge conflicts.Time requirements in _Ronstation folders have been moved to bats.
Some now unnecessary legal headers have been removed.
Media
Requirements
Breaking changes
Changelog
🆑