Merge branch 'master' into Mario/weapon_impulse_exclusion

diff --cc qcsrc/common/weapons/all.qh
index 5a018f4bc032fb68c9267f8464e0cc5b9be19919,82494c3a1ffdc504fa3a5ae385c81631e8945ccf..3ae3aadcf12aae66ca3bc72073b19f0746e1f201
--- 1/qcsrc/common/weapons/all.qh
--- 2/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@@ -46,11 -46,9 +46,11 @@@ STATIC_INIT(WeaponPickup
  #define WepSet_FromWeapon(it) ((it).m_wepset)
  WepSet _WepSet_FromWeapon(int i);
  
 +.int m_impulse;
 +
  #define DEFAULT_FILENAME "weapons_dump.cfg"
  // NOTE: dumpeffectinfo, dumpnotifs, dumpturrets and dumpweapons use similar code
- GENERIC_COMMAND(dumpweapons, "Dump all turrets into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
+ GENERIC_COMMAND(dumpweapons, "Dump all weapons into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
  {
        switch(request)
        {