Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/defaultServer.cfg b/defaultServer.cfg
index e89c7f83b12f7a4586f7e611f26d4a3f3c4fc4f2..80e4f0dc945daeb60ee06fa8141a6f28f99d7ab3 100644 (file)
--- a/defaultServer.cfg
+++ b/defaultServer.cfg
@@ -223,9 +223,6 @@ set g_balance_cloaked_alpha 0.25
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
 set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
 
-set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
-set g_grappling_hook_useammo 0 "use ammunition with the off-hand grappling hook"
-
 set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
 set g_spawn_furthest 0.5 "this amount of the spawns shall be far away from any players"
 set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"