Merge branch 'Melanosuchus/preconnect' into 'master'

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

diff --git a/mutators.cfg b/mutators.cfg
index adfcd240522d7e07f21cbbecef049650c0ec755b..be5af23f9c1ad9f6e2950369c28f5275abab9447 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -37,12 +37,10 @@ set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carr
 //  overkill
 // ==========
 set g_overkill 0 "enable overkill"
-set g_overkill_superguns_builtin 0
 
 set g_overkill_100a_anyway 1
 set g_overkill_100h_anyway 1
 set g_overkill_powerups_replace 1
-set g_overkill_superguns_onemag 1
 set g_overkill_superguns_respawn_time 20
 
 set g_overkill_ammo_charge 1
@@ -68,6 +66,13 @@ set g_overkill_ammo_decharge_hmg 0.01
 set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
 
 
+// ========
+//  midair
+// ========
+set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
+set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
+
+
 // =========
 //  sandbox
 // =========
@@ -119,7 +124,7 @@ set g_spawn_near_teammate_ignore_spawnpoint_closetodeath 1 "spawn as close to de
 // at each time, everyone uses the same weapon,
 // and in regular intervals, this weapon is cycled
 set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
-set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
+set g_nix_with_blaster 0 "always carry the blaster as an additional weapon in NIX"
 set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
 set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"