Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/server/weapons/weaponsystem.qc

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
index 93d2af55b49c94ec83fe07c400cf3ac75254a931,ad479824ec76f654a21877f546b0c273a4fff525..2e0ee09bf8df718d593943e4a777f0b99d1627b5
--- 1/qcsrc/server/weapons/weaponsystem.qc
--- 2/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@@ -449,13 -441,12 +449,12 @@@ void W_WeaponFrame(Player actor, .entit
                }
        }
  
 -      if (PS(actor).m_switchweapon == WEP_Null)
 +      if (this.m_switchweapon == WEP_Null)
        {
 -              PS(actor).m_weapon = WEP_Null;
 -              PS(actor).m_switchingweapon = WEP_Null;
 +              this.m_weapon = WEP_Null;
 +              this.m_switchingweapon = WEP_Null;
                this.state = WS_CLEAR;
 -              actor.weaponname = "";
 +              this.weaponname = "";
-               // actor.items &= ~IT_AMMO;
                return;
        }