Merge branch 'master' into Lyberta/RandomItems

# Conflicts:
#	mutators.cfg

diff --cc mutators.cfg
index ac5a4fda74114828d3d1abdedcdc0edf65900fbf,c16fda72e32b16f7d7f54df0d66afe772f065147..e37c190902d4901aa02ee2e5abbd86188c6f4489
--- 1/mutators.cfg
--- 2/mutators.cfg
+++ b/mutators.cfg
@@@ -476,9 -478,10 +480,17 @@@ set g_dynamic_handicap_exponent 1 "The 
  set g_dynamic_handicap_min 0 "The minimum value of the handicap."
  set g_dynamic_handicap_max 0 "The maximum value of the handicap."
  
+ // =====================
+ //  stale-move negation
+ // =====================
+ set g_smneg 0 "Stale-move negation: penalize repeated use of the same weapon"
+ set g_smneg_bonus 1 "Stale-move negation: allow weapons to become stronger than their baseline"
+ set g_smneg_bonus_asymptote 4 "Stale-move negation: damage = infinity at this bonus level"
+ set g_smneg_cooldown_factor 0.25 "Stale-move negation: penalty cooldown factor"
++
 +// ==============
 +//  random items
 +// ==============
 +set g_random_items 0 "Whether to enable random items."
 +set g_random_loot 0 "Whether to enable random loot."
 +exec randomitems-xonotic.cfg

diff --cc qcsrc/common/mutators/mutator/_mod.inc
Simple merge

diff --cc qcsrc/common/mutators/mutator/_mod.qh
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge