X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=mutators.cfg;h=c5fe782348cab763bb74f91a1ab7acad33274a05;hb=65683f18196f10a4ef2d82dd8e081dc7cecb8d46;hp=6873aa89ea604ca1c3af89f99dbae187af404791;hpb=28931c8069eb1d283f01a26f31ad91d921294d9c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/mutators.cfg b/mutators.cfg
index 6873aa89e..c5fe78234 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -23,14 +23,14 @@ set sv_dodging_frozen 0 "allow dodging while frozen"
 
 
 // ===========
-//  minstagib
+//  instagib
 // ===========
-set g_minstagib 0 "enable minstagib"
-set g_minstagib_extralives 1 "how many extra lives you will get per powerup"
-set g_minstagib_ammo_start 10 "starting ammo"
-set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
-set g_minstagib_invis_alpha 0.15
-set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
+set g_instagib 0 "enable instagib"
+set g_instagib_extralives 1 "how many extra lives you will get per powerup"
+set g_instagib_ammo_start 10 "starting ammo"
+set g_instagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
+set g_instagib_invis_alpha 0.15
+set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
 
 
 // =========
@@ -231,13 +231,13 @@ set g_campcheck_damage 100
 set g_campcheck_distance 1800
 
 
-<<<<<<< HEAD
 // ==========
-//  New Toys
+//  new toys
 // ==========
 set g_new_toys 0 "Mutator 'New Toys': enable extra fun guns"
 set g_new_toys_autoreplace 2 "0: never replace, 1: always auto replace guns by available new toys, 2: randomly auto replace guns by available new toys"
-=======
+
+
 // =======
 //  buffs
 // =======
@@ -284,4 +284,3 @@ set g_buffs_flight_gravity 0.3 "player gravity multiplier while holding flight b
 set g_buffs_invisible 1 "invisible buff: carrier becomes invisible"
 set g_buffs_invisible_alpha 0.4 "player invisibility multiplier while holding invisible buff"
 
->>>>>>> master