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

Revamp rules #77

Merged
merged 13 commits into from Nov 18, 2019
Merged

Revamp rules #77

merged 13 commits into from Nov 18, 2019

Conversation

residal
Copy link
Contributor

@residal residal commented Nov 4, 2019

No description provided.

@jellz jellz self-requested a review November 4, 2019 10:57
@jellz jellz changed the title Update ServerRules.js Revamp rules Nov 5, 2019
@jellz jellz removed their request for review November 5, 2019 05:18
src/pages/ServerRules.js Outdated Show resolved Hide resolved
src/pages/ServerRules.js Outdated Show resolved Hide resolved
Copy link

@Owehttamy Owehttamy left a comment

Choose a reason for hiding this comment

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

Line 32 has unnecessary/unbalanced parentheses

Replace comma on line 34 with a semicolon

37 -> "Do not leak personal information. Sharing or threatening of sharing others' personal information such as IP addresses, phone numbers, or other commonly hidden information will result in a blacklist. Your access to our Discord server and Minecraft server will be permanently taken away."

Line 60 -> "Discrimination of any kind will not be tolerated."

Add a comma after "chat flood" on line 62.

Also change line 37, 38, 39, 40, 60
Copy link

@Owehttamy Owehttamy left a comment

Choose a reason for hiding this comment

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

14: "may result in a punishment" -> "may result in punishment"
30: "Toxic behaviour" -> "Toxic behavior" (Warzone is owned by 'Muricans)
32: "not welcome on Warzone etc." -> "not welcome on Warzone, etc."
37: "Sharing someones IP address" -> "Sharing someone's IP address"
38: "hidden information, will result" -> "hidden information will result"
46: "YouTube channels and Discord servers." -> "YouTube channels, and Discord servers"
58: "Use of" -> "The use of"
105: "is not allowed" -> "are not allowed"
112: "one click at a time are not permitted" -> "one click at a time is not permitted"
129: "Use of voice changers/soundboards"-> "The use of voice changers and soundboards"
141: "in game" -> "in-game"

149 - 158 need to be updated since reports and appeals aren't held in the discord anymore.

Edited more mistakes. I've changed the message on the bottom of the page, I apologize if I may have messed up the code.
@jellz jellz merged commit 312664c into Warzone:master Nov 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants