Merge branch 'nightly' into organizing

2022-06-16 13:05:06 -05:00
parent 06409be232 facd9cf97f
commit 1380d749f4
13 changed files with 388 additions and 327 deletions
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -216,6 +216,7 @@ let globalConfig = {
 	passwordRequiredSymbols: 0,
 	minChatLines: 1,
 	maxChatLines: 6,
+	vehicleTrunkDistance: 2.0,
 };

 // ===========================================================================