Merge branch 'drjaska/whitelist_weaponarena' into 'master'

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

diff --git a/mutators.cfg b/mutators.cfg
index ac965a2e1b313b0b5bedb8369cc53327e152a0bc..66fe9214205907c7797e291b814f56a19fe65d3b 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -63,6 +63,8 @@ set g_overkill_filter_healthmega 0
 set g_overkill_filter_armormedium 1
 set g_overkill_filter_armorbig 1
 set g_overkill_filter_armormega 0
+set g_overkill_blaster_keepdamage 0 "allow secondary fire to hurt players"
+set g_overkill_blaster_keepforce 0 "allow secondary fire to push players"
 
 
 // =========
@@ -76,7 +78,7 @@ set g_vampire_use_total_damage 0 "If 1 then add combined damage (health + armor)
 // ========
 //  midair
 // ========
-set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
+set g_midair 0 "if set to 1 you can only apply damage to your opponent while they are airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 
 
@@ -160,7 +162,7 @@ set g_touchexplode_force 300
 // ================
 //  super spectate
 // ================
-set g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
+set g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
 
 
 // ==================
@@ -263,7 +265,7 @@ set g_nades_ice_teamcheck   0 "Don't freeze teammates"
 set g_nades_spawn_count 3 "Number of times player will spawn at their spawn nade explosion location"
 
 // Heal (6)
-set g_nades_heal_time 5 "How long the heling field will last"
+set g_nades_heal_time 5 "How long the healing field will last"
 set g_nades_heal_rate 30 "Health given per second"
 set g_nades_heal_friend 1 "Multiplier of health given to team mates"
 set g_nades_heal_foe   -2 "Multiplier of health given to enemies"