Merge branch 'master' into divVerent/4team_ctf

[xonotic/xonotic-data.pk3dir.git] / gamemodes.cfg

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 744eb02d6bc87cad6e8d2f0564f4d080cacd90be..a7c67439457afdab2efda5ed9a1ae1c3d59546f4 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -89,7 +89,7 @@ seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo
 // =================================
 // when variables are set to anything other than 0, they take over the global setting...
 // to force disable delay or waves, set them to 0.125
-set g_ctf_respawn_delay 0
+set g_ctf_respawn_delay 5
 set g_ctf_respawn_waves 0
 set g_ctf_weapon_stay 0
 set g_dm_respawn_delay 0
@@ -227,6 +227,10 @@ set g_ctf_flag_red_model "models/ctf/flags.md3"
 set g_ctf_flag_red_skin 0
 set g_ctf_flag_blue_model "models/ctf/flags.md3"
 set g_ctf_flag_blue_skin 1
+set g_ctf_flag_yellow_model "models/ctf/flags.md3"
+set g_ctf_flag_yellow_skin 2
+set g_ctf_flag_pink_model "models/ctf/flags.md3"
+set g_ctf_flag_pink_skin 3
 set g_ctf_flag_glowtrails 1
 set g_ctf_fullbrightflags 0
 set g_ctf_dynamiclights 0