Merge remote-tracking branch 'origin/master' into rustsql

This commit is contained in:
Letter N
2021-01-20 15:40:41 +08:00
606 changed files with 9932 additions and 4818 deletions

View File

@@ -11,6 +11,7 @@ $include dynamic_config.txt
$include plushies/defines.txt
$include job_threats.txt
$include policy.txt
$include persistence.txt
$include respawns.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game