diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 736cf140a..97d2c279b 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -205,6 +205,14 @@ Engine Development - [Testing against launcher](en/engine-development/testing-against-launcher.md) - [Updating CEF](en/engine-development/updating-cef.md) +Staff +============== + +---------------------- + +- [Maintainer Policy](en/staff/maintainer-policy.md) +- [Staff Conflict Resolution](en/staff/staff-conflict-resolution.md) + Maintainer Meetings ============== diff --git a/src/en/staff/maintainer-policy.md b/src/en/staff/maintainer-policy.md new file mode 100644 index 000000000..bbbece514 --- /dev/null +++ b/src/en/staff/maintainer-policy.md @@ -0,0 +1,19 @@ +# Maintainer Policy +## Reviews and merging PRs +Before merging any PR that is not a simple bug-fix you **MUST**: +- Link the PR in [#maint-review-pings](https://discord.com/channels/310555209753690112/1258585578618884167) AND ping Maintainers and any relevant Design Work Groups for review. +If this PR may affect game admins too (rules, rule clarifications, round flow, etc) **all Head Game Admins must be pinged as well.** + - **If you are not sure, ping Head Game Admins anyways.** +- The PR must have at least one **Maintainer** approving it, and at least 24 hours must have passed since you pinged Maintainers, the relevant Design Groups, and Game Admins if applicable in that channel, with no one dissenting to merging said PR. +- Once those 24 hours are up: + - If no one dissents, the PR can be merged. + - If there is dissent, the PR author must be notified on GitHub of people's requests for changes and/or arguments against it. You do not need to put a ton of effort in summarizing people's points, simply list opinions as "Maintainer opinion" and "Game Admin opinion". + - **These opinions must be communicated in a neutral manner, even if you disagree with them.** + - This is the case even if only one person dissents. + - If a deadlock is reached where one or more people's dissents cannot be resolved, **a 24-hour-long poll** must be made in the channel with **another Maintainer + Work Groups + Head Game Admin (if relevant) ping**. + - At least **75% or more of voters** must agree to it being merged before it does. + - There is no veto power from any role in the project. + - If less than 75% of people vote to merge the PR, it must be discussed again and the PR author must be notified. + - If after another 48 hours no poll reaches 75% or more approvals, the PR may be closed. + +**Breaking any of these rules may result in an instant demotion from Maintainer.** diff --git a/src/en/staff/staff-conflict-resolution.md b/src/en/staff/staff-conflict-resolution.md new file mode 100644 index 000000000..484ff790e --- /dev/null +++ b/src/en/staff/staff-conflict-resolution.md @@ -0,0 +1,21 @@ +# Staff Conflict Resolution +"Staff" in this context means: Any Maintainer, Art Director, Project Manager, or Wizard. +This does NOT include Game Admins as of writing this. + +If a conversation makes one or more Staff members uncomfortable to the point that a fight happens, **you and anyone else witnessing this must follow the following steps:** +- Ping Community Moderator and Project Manager immediately. +- DM one or multiple Community Moderators and Project Managers, linking them to the ongoing fight and saying that it needs conflict resolution. +- If you are involved in the fight or argument, immediately disconnect, do not engage further, and do not even open or read the channel. + - Do not go to another channel on the SS14 discord to vent your frustration. +- **It is completely prohibited to time out, kick or ban any Staff member.** +- Warn everyone involved that they need to immediately disengage and close the channel. +- If after **three warnings** someone continues to do so, **DM then with another warning**. +- **If they further refuse to disengage and two Project Managers (who are not personally involved in the fight) agree to do so**, only then may a Project Manager or Community Moderator time them out for only ten (10) minutes while the Project Managers come to a collective decision on how to resolve the situation. + - If they remain disruptive, and another 2+ Project Manager consensus is reached on doing so, it may be scaled to 1 hour, then 1 day. +- The Project Managers **must** then communicate privately to handle this issue in [#business](https://discord.com/channels/1083301917503000586/1083348051768381530) with a ping. +- Any people involved in the conflict **may** communicate privately with any Project Manager that is willing to receive their complaints, or post a complaint in the [Staff Complaints section of the forums](https://forum.spacestation14.com/c/staff-complaints/14). + - If you are a Project Manager receiving these complaints and do not want to handle them, **you must relay them to the Project Manager discord's [#business](https://discord.com/channels/1083301917503000586/1083348051768381530) channel with a ping.** + +**Breaking this policy once, both if you are the person involved in the fight OR the one resolving it, will result in a warning.** +**Any further violations within a month will lead to an immediate but temporary demotion.** +**If any further violations occur after that, you may be removed from the project.**