Skip to content

Commit 48c4b9d

Browse files
Apply suggestions from code review
Co-authored-by: Rem <Remfexxel@pm.me>
1 parent e3bf337 commit 48c4b9d

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/en/general-development/codebase-info/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ What does this mean for you? If you're a fork developer, this means that you now
88
Updates are deployed every 14 days over the course of a weekend (Usually on a Saturday). 2 days prior to update day, "master" will be branched into "staging" and maintainers will perform a review of the upcoming changes. During this period, changes may be made or PRs may be reverted on the staging branch. Release day also coincides with the day of the regular maintainer meeting, half of which will be devoted to looking over the changes prepared for release. The outcome of this meeting determines if the update will be deployed as is, receive changes, or be delayed. The following 2 days after an update is deployed will allow for balance/minor gameplay fixes to be deployed under the normal Hotfix procedure.
99

1010
### Review/PR Procedure
11-
All PRs must be reviewed according to the PR review procedure [documented here](../../wizden-staff/maintainer/content-review-procedure.md), and may be merged to the development branch "master" at any point. PR's fixing code bugs or critical gameplay issues *may* be merged directly onto the "stable" branch but in that case must additionally follow the Hotfix procedure [documented here](../../wizden-staff/maintainer/hotfix-procedure.md).
11+
All PRs must be reviewed according to the PR review procedure [documented here](../../wizden-staff/maintainer/content-review-procedure.md), and may be merged to the development branch "master" at any point. PR's fixing code bugs or critical gameplay issues *may* be merged directly onto the "stable" branch, but in that case must additionally follow the Hotfix procedure [documented here](../../wizden-staff/maintainer/hotfix-procedure.md).
1212

1313
### What is Hotfixable?
1414
Any issue that directly impacts a player's ability to play the game in a largely negative way and can be considered by most to be a "bug" is eligable to be merged as a Hotfix. Critical gameplay issues may also fall into this category as well. "Critical" being an issue that is majorly disruptive to players **or admins**. *Outside of an emergency*, all **Hotfixes require 3 maintainers to sign-off** on merging (Ideally they should also review but giving approval is enough). Bugfixes may be applied to master following the regular review requirements.

src/en/wizden-staff/maintainer.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ A maintainer is a member of staff who is given authority and trust to review and
88

99
### SS14 Maintainer
1010

11-
A SS14 Maintainer maintains the content side of Space Station 14. This includes the docs repo and the content repo.
11+
An SS14 maintainer maintains the content side of Space Station 14. This includes the docs repo and the content repo.
1212

1313
### Documaintainer
1414

15-
A Documaintainer is an SS14 maintainer who only has maintainer powers for the Docs Repo. Within the docs repo, they have the same power and authority as an SS14 maintainer.
15+
A documaintainer is an SS14 maintainer who only has maintainer powers for the docs repository. Within the docs repository, they have the same power and authority as an SS14 maintainer.
1616

1717
### Head Mapper
1818

19-
A Head Mapper is an SS14 Maintainer who has exclusive power over content PRs with map changes and additions. These maintainers are expected to ensure mapping standards are met, and their approval is required for any PRs that make mapping changes.
19+
A head mapper is an SS14 Maintainer who has exclusive power over content PRs with map changes and additions. These maintainers are expected to ensure mapping standards are met, and their approval is required for any PRs that make mapping changes.
2020

2121
### Art Lead
2222

23-
An Art Lead is an SS14 Maintainer who has exclusive power over content PRs with sprite changes and additions. These maintainers are expected to ensure the game maintains its art style, and their approval is required for any PRs that make significant changes to existing sprites or add new sprites.
23+
An art lead is an SS14 maintainer who has exclusive power over content PRs with sprite changes and additions. These maintainers are expected to ensure the game maintains its art style, and their approval is required for any PRs that make significant changes to existing sprites or add new sprites.
2424

2525
### UI Lead
2626

27-
A UI Lead is an SS14 Maintainer who has exclusive power over content PRs with UI changes and additions. These maintainers are expected to ensure the game retains usable, aesthetically pleasing UIs which fit the game's art style.
27+
A UI lead is an SS14 maintainer who has exclusive power over content PRs with UI changes and additions. These maintainers are expected to ensure the game retains usable, aesthetically pleasing UIs which fit the game's art style.
2828

2929
### Robust Toolbox Maintainer
3030

31-
A Robust Toolbox maintainer is a maintainer for the game's engine, Robust Toolbox. These are the only Maintainers who have merge powers for the engine.
31+
A Robust Toolbox maintainer is a maintainer for the game's engine, Robust Toolbox. These are the only maintainers who have merge powers for the engine.

src/en/wizden-staff/maintainer/maintainer-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This policy applies in addition to the [General Staff](../staff-policy.md) and [
55

66
**Breaking any of these rules will result in disiplinary action being taken**
77
## Reviews and Feedback
8-
- All maintainers must follow the [PR Review](../maintainer/content-review-procedure.md) and [Hotfix Procedures](../maintainer/hotfix-procedure.md) when they apply.
8+
- All maintainers must follow the [PR review](../maintainer/content-review-procedure.md) and [hotfix procedures](../maintainer/hotfix-procedure.md) when they apply.
99
- Maintainers should try to the best of their ability, to keep PR authors informed on the status of their PRs.
1010
- Maintainers should keep public criticism of code *constructive* and avoid making comments in regards to the authors of the code. **Harsh but fair** citicism of code is *acceptable*, but criticism of its author is not.
1111
- Maintainers should try to perform code reviews *whenever possible*, getting content into the game is everyone's responsibility.

0 commit comments

Comments
 (0)