From 53ac5588c1799a905a88046d00c3ce0b105fa071 Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 17 Jan 2018 19:25:01 +1300 Subject: [PATCH 1/2] Merge pull request #34494 from tgstation/KorPhaeron-patch-1 Adds a line about alien species to contributing.md --- .github/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 30029c87bb..7de3b2eb45 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -387,6 +387,7 @@ There is no strict process when it comes to merging pull requests. Pull requests Do not add any of the following in a Pull Request or risk getting the PR closed: * National Socialist Party of Germany content, National Socialist Party of Germany related content, or National Socialist Party of Germany references * Code where one line of code is split across mutiple lines (except for multiple, separate strings and comments; in those cases, existing longer lines must not be split up) +* Code adding, removing, or updating the availability of alien races/species/human mutants without prior approval. Just becuase something isn't on this list doesn't mean that it's acceptable. Use common sense above all else.