Merge branch 'master' into TimePath/global_self

# Conflicts:
#	qcsrc/common/weapons/weapon/vaporizer.qc

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
index aa1fb54c102ee375d30e7b0d9011b7e326305fe7,256019d69de67b91a12084a981a4e96e9b5b8b8d..399ce4e584366b2dd0e54c1fa4f645eeafab0665
--- 1/qcsrc/common/weapons/weapon/vaporizer.qc
--- 2/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@@ -69,11 -70,11 +70,11 @@@ void W_RocketMinsta_Explosion(vector lo
  }
  
  void W_Vaporizer_Attack(void)
 -{
 +{SELFPARAM();
-       float flying;
-       flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
+       bool flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
+       float vaporizer_damage = ((WEP_CVAR_PRI(vaporizer, damage) > 0) ? WEP_CVAR_PRI(vaporizer, damage) : 10000);
  
-       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, W_Sound("minstanexfire"), VOL_BASE * 0.8, ATTEN_NORM);

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

diff --cc qcsrc/server/mutators/mutator_instagib.qc
index 3295255de23cfde95c48004ed72d4bf894b9e159,2b69551e7152c98fc85921b16b99c405d6ed22bb..ee9c6de8cebe2c8e9319168997d24b6d97880b16
--- 1/qcsrc/server/mutators/mutator_instagib.qc
--- 2/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -385,8 -390,16 +387,16 @@@ MUTATOR_HOOKFUNCTION(instagib_ItemCount
        return false;
  }
  
+ MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
+ {     
+       if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER.m_id))
+               frag_damage = 1000; // always gib if it was a vaporizer death
+ 
+       return FALSE;
+ }
+ 
  MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
 -{
 +{SELFPARAM();
        if(self.ammo_cells)
        {
                // play some cool sounds ;)