Merge branch 'terencehill/countrylist_removal' into 'master'

[xonotic/xonotic-data.pk3dir.git] / ruleset-XPM.cfg

diff --git a/ruleset-XPM.cfg b/ruleset-XPM.cfg
index f3607bb2f86cbc696f06eb2ffe46154b21f38279..67589147b634f9968c2b1e6af4b906c37a3af9c1 100644 (file)
--- a/ruleset-XPM.cfg
+++ b/ruleset-XPM.cfg
@@ -14,6 +14,7 @@ set teamplay_mode 2 // friendly fire and self damage
 set sv_vote_nospectators 1
 set g_chat_nospectators 2
 set g_warmup 1
+set g_warmup_limit 0
 set g_balance_teams 0
 set g_spawnshieldtime 0
 set g_spawn_furthest 1
@@ -24,3 +25,4 @@ set g_monsters 0
 set g_turrets 0
 set g_vehicles 0
 set sv_showspectators 0
+set sv_taunt 0