Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

diff --combined qcsrc/server/t_items.qc
index f543d4d08a9767b3bf230766e38b6ea1977e5f4f,12025a3eeda207699d55edafc7f3b9ac726881a7..0c0801eaa7d0e4a6b62e5906a1e89db7716b49b2
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -390,7 -390,7 +390,7 @@@ float Item_GiveTo(entity item, entity p
                }
  
                if (item.flags & FL_WEAPON)
-               if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && !(g_weapon_stay == 3 && !e.spawnshieldtime)))
+                       if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && g_weapon_stay == 0))
                {
                        pickedup = TRUE;
                        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
@@@ -1041,7 -1041,7 +1041,7 @@@ void weapon_defaultspawnfunc(float wpn
  
  void spawnfunc_weapon_shotgun (void);
  void spawnfunc_weapon_uzi (void) {
 -      if(q3acompat_machineshotgunswap)
 +      if(autocvar_sv_q3acompat_machineshotgunswap)
        if(self.classname != "droppedweapon")
        {
                weapon_defaultspawnfunc(WEP_SHOTGUN);
@@@ -1051,7 -1051,7 +1051,7 @@@
  }
  
  void spawnfunc_weapon_shotgun (void) {
 -      if(q3acompat_machineshotgunswap)
 +      if(autocvar_sv_q3acompat_machineshotgunswap)
        if(self.classname != "droppedweapon")
        {
                weapon_defaultspawnfunc(WEP_UZI);
@@@ -1107,7 -1107,7 +1107,7 @@@ void spawnfunc_item_rockets (void) 
  void spawnfunc_item_shells (void);
  void spawnfunc_item_bullets (void) {
        if(!weaponswapping)
 -      if(q3acompat_machineshotgunswap)
 +      if(autocvar_sv_q3acompat_machineshotgunswap)
        if(self.classname != "droppedweapon")
        {
                weaponswapping = TRUE;
@@@ -1133,7 -1133,7 +1133,7 @@@ void spawnfunc_item_cells (void) 
  
  void spawnfunc_item_shells (void) {
        if(!weaponswapping)
 -      if(q3acompat_machineshotgunswap)
 +      if(autocvar_sv_q3acompat_machineshotgunswap)
        if(self.classname != "droppedweapon")
        {
                weaponswapping = TRUE;