Merge branch 'master' into Mario/weapons_fpsfix

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge

diff --cc xonotic-client.cfg
index fa124a4e82ca1672b3a2a2f4c070c4831fb7adde,b8d865d4df142e4c9158e87853e4d9aac3f7ace6..675df3b090b3f2b02890eb360ead1ef2e1abb0fc
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -838,9 -837,8 +837,9 @@@ seta cl_ghost_items_color "-1 -1 -1" "c
  seta cl_simple_items 0 "enable simple items (if server allows)"
  set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled"
  set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)"
- set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
+ set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0 (colormod format: 0 0 0 leaves the color unchanged, negative values allowed)"
  set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
 +seta cl_weapons_animate 0 "Use animated weapon models"
  
  seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled"