Merge remote-tracking branch 'upstream/master' into station-holograph2

DeltaV-Station · Oct 10, 2023 · 8a907be · 8a907be
2 parents ec6e980 + f4b379b
commit 8a907be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Resources/ConfigPresets/DeltaV/apoapsis.toml b/Resources/ConfigPresets/DeltaV/apoapsis.toml
@@ -0,0 +1,2 @@
+[game]
+hostname         = "[EN][MRP] Delta-v (Ψ) | Apoapsis"
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -8,18 +8,18 @@ github     = "https://github.com/DeltaV-Station/Delta-v"
 website    = "https://www.delta-v.org/"
 wiki       = "https://wiki.delta-v.org/view/Main_Page"
 patreon    = "https://www.patreon.com/Delta_v"
-bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose
+bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose"
 forum      = "https://forum.delta-v.org/"
 
 [net]
 max_connections = 1024
+tickrate = 30
 
 [vote]
 restart_required_ratio = 0.7
 
 [netres]
 limit    = 10.0
-tickrate = 30
 
 [admin]
 see_own_notes   = true

diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml
@@ -1,7 +1,6 @@
 [game]
 hostname         = "[EN][MRP] Delta-v (Ψ) | Periapsis"
 soft_max_players = 100
-max_players      = 120
 
 [server]
 rules_file   = "Rules.txt"
@@ -16,4 +15,4 @@ min_players = 30
 enable_during_round = true
 
 [hub]
-tags = "lang:en-US,region:am_n_e,rp:med"
+tags = "lang:en-US,region:am_n_e,rp:med"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[game]
		hostname = "[EN][MRP] Delta-v (Ψ) \| Apoapsis"