Merge branch 'master' into divVerent/weapons-field-rewrite

Conflicts:
	qcsrc/server/t_items.qc

diff --cc balanceXonotic.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/cl_weapons.qc
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/t_items.qc
index eaba390ed6b693363120416ba12fc8fa6895e8d4,5b9a2e5f99b9bc5e1c20d4bbbbbaa8414ffa58f9..93b857fecfd4801507b3ef4e8571afab71e7ef36
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -376,10 -377,8 +376,8 @@@ float Item_GiveTo(entity item, entity p
                        // else if(item.items == IT_CELLS)
                        //      AnnounceTo(player, "ammo");
  
 -                      if (item.weapons & WEPBIT_MINSTANEX)
 +                      if (WEPSET_CONTAINS_EW(item, WEP_MINSTANEX))
                                W_GiveWeapon (player, WEP_MINSTANEX, item.netname);
-                       if (item.ammo_cells)
-                               player.ammo_cells = bound(player.ammo_cells, 999, player.ammo_cells + autocvar_g_minstagib_ammo_drop);
                        player.health = 100;
                }
  
@@@ -1106,7 -1112,12 +1116,12 @@@ void weapon_defaultspawnfunc(float wpn
        if(self.team)
                f |= FL_NO_WEAPON_STAY;
  
 -      StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapons, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+       // stupid minstagib hack, don't ask
+       if(g_minstagib)
+               if(self.ammo_cells)
+                       self.ammo_cells = autocvar_g_minstagib_ammo_drop;
+ 
 +      StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
        if (self.modelindex) // don't precache if self was removed
                weapon_action(e.weapon, WR_PRECACHE);
  }