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
// =======
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