Skip to content

Commit

Permalink
Merge branch 'master' into Ghomie-tg65
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghommie committed Mar 3, 2021
2 parents 42aa4c1 + 8f45380 commit 919a179
Show file tree
Hide file tree
Showing 682 changed files with 26,506 additions and 12,397 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
/tools/LinuxOneShot/ @Cyberboss
/tools/tgs4_scripts/ @Cyberboss

# Jared-Fogle
# Mothblocks

/code/modules/unit_tests/ @Jared-Fogle
/code/modules/unit_tests/ @Mothblocks

# Jordie0608

Expand Down
3 changes: 2 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ for (var/i in reagents)

* Do not divide when you can easily convert it to multiplication. (ie `4/2` should be done as `4*0.5`)

* Separating single lines into more readable blocks is not banned, however you should use it only where it makes new information more accessible, or aids maintainability. We do not have a column limit, and mass conversions will not be received well.

* If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.

* Changes to the `/config` tree must be made in a way that allows for updating server deployments while preserving previous behaviour. This is due to the fact that the config tree is to be considered owned by the user and not necessarily updated alongside the remainder of the code. The code to preserve previous behaviour may be removed at some point in the future given the OK by maintainers.
Expand Down Expand Up @@ -666,7 +668,6 @@ Regarding sprites & sounds, you must credit the artist and possibly the codebase
## Banned content
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. Pull requests attempting to add or remove features from said races/species/mutants require prior approval as well.
* Code which violates GitHub's [terms of service](https://github.com/site/terms).

Expand Down
9 changes: 9 additions & 0 deletions .github/RUNNING_A_SERVER.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ If you'd like a more robust server hosting option for tgstation and its
derivatives. Check out our server tools suite at
https://github.com/tgstation/tgstation-server

If you decide to go this route, here are /tg/ specific details on hosting with TGS.

- We have two directories which should be setup in the instance's `Configuration/GameStaticFiles` directory:
- `config` should be where you place your production configuration. Overwrites the default contents of the repo's [config](../config) directory.
- `data` should be initially created as an empty directory. The game stores persistent data here.
- You should incorporate our [custom build scripts for TGS4](../tools/tgs4_scripts) in the instance's `Configuration/EventScripts` directory. These handle including TGUI in the build and setting up rust-g on Linux.
- Deployment security level must be set to `Trusted` or it will likely fail due to our native library usage.
- We highly recommend using the BYOND version specified in [dependencies.sh](../dependencies.sh) to avoid potential unrecorded issues.

## SQL SETUP

The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database
Expand Down

0 comments on commit 919a179

Please sign in to comment.