Merge branch 'master' into Mario/weapons

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

diff --git a/mutators.cfg b/mutators.cfg
index 4b79048677499c02e4af4a2ff9071b05702d72c7..6873aa89ea604ca1c3af89f99dbae187af404791 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -231,6 +231,13 @@ set g_campcheck_damage 100
 set g_campcheck_distance 1800
 
 
+<<<<<<< HEAD
+// ==========
+//  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
 // =======
@@ -277,3 +284,4 @@ 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