X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=xonotic-server.cfg;h=956fb215548c55d20e9a62bd27cc2d0e31942901;hp=6aa5844b7d871ae817ffba57801e2b1d319014d6;hb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;hpb=04178ec17db0c9a1e726d653216355a1c6ba3918

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 6aa5844b7..956fb2155 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -25,7 +25,7 @@ set g_maxplayers_spectator_blocktime 5	"if the players voted for the \"nospectat
 
 // tournament mod
 set g_warmup 0	"split the game into a warmup- and match-stage"
-set g_warmup_limit 0	"limit warmup-stage to this time (in seconds); if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage"
+set g_warmup_limit 180	"limit warmup-stage to this time (in seconds); if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage"
 set g_warmup_allow_timeout 0	"allow calling timeouts in the warmup-stage (if sv_timeout is set to 1)"
 set g_warmup_allguns 1	"provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons"
 set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"
@@ -540,12 +540,13 @@ set g_mod_config  "" "Current config mod name"
 exec balance-xonotic.cfg
 exec physicsX.cfg
 exec turrets.cfg
+exec vehicles.cfg
 exec gamemodes-server.cfg
 exec mutators.cfg
 exec monsters.cfg
 exec minigames.cfg
 exec physics.cfg
-exec help-xonotic.cfg
+if_dedicated exec help-xonotic.cfg
 
 set sv_join_notices ""
 set sv_join_notices_time 15