Merge branch 'master' into Mario/vaporizer_damage

Conflicts:
	qcsrc/common/weapons/w_vaporizer.qc

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc bal-wep-xpm.cfg
Simple merge

diff --cc qcsrc/common/weapons/w_vaporizer.qc
index f55342f923e1151a548960a8a33648774eb5c8a7,b67056f7e2257926c58cfdcc29bf7e1510da82b1..649f0e314c894e7b2d76ac775e1fcea4f8b4b435
--- 1/qcsrc/common/weapons/w_vaporizer.qc
--- 2/qcsrc/common/weapons/w_vaporizer.qc
+++ b/qcsrc/common/weapons/w_vaporizer.qc
@@@ -54,11 -53,10 +54,11 @@@ void spawnfunc_weapon_minstanex(void) 
  
  void W_Vaporizer_Attack(void)
  {
 -      float flying;
 +      float flying, vaporizer_damage;
        flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 +      vaporizer_damage = ((WEP_CVAR_PRI(vaporizer, damage) > 0) ? WEP_CVAR_PRI(vaporizer, damage) : 10000);
  
-       W_SetupShot(self, TRUE, 0, "", CH_WEAPON_A, vaporizer_damage);
 -      W_SetupShot(self, true, 0, "", CH_WEAPON_A, 10000);
++      W_SetupShot(self, true, 0, "", CH_WEAPON_A, vaporizer_damage);
        // handle sound separately so we can change the volume
        // added bonus: no longer plays the strength sound (strength gives no bonus to instakill anyway)
        sound (self, CH_WEAPON_A, "weapons/minstanexfire.wav", VOL_BASE * 0.8, ATTEN_NORM);

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

diff --cc qcsrc/server/mutators/mutator_instagib.qc
index b15a210486abdde26793aea7239eb0dec808f2f1,b3502b0f783573c6467ec9752dc13d4d13326f0b..643d3ac881baaba7bd147a83d3bb52a1b432d776
--- 1/qcsrc/server/mutators/mutator_instagib.qc
--- 2/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -361,17 -365,9 +365,17 @@@ MUTATOR_HOOKFUNCTION(instagib_ItemCount
                case IT_NAILS:      item_name = "item-extralife"; item_color = '1 0 0'; break;
                case IT_INVINCIBLE: item_name = "item-speed"; item_color = '1 0 1'; break;
        }
-       return FALSE;
+       return false;
  }
  
 +MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
 +{     
 +      if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
 +              frag_damage = 1000; // always gib if it was a vaporizer death
 +
 +      return FALSE;
 +}
 +
  MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
  {
        if(self.ammo_cells)