Merge branch 'terencehill/blaster_attack_shared' into 'master'

Make weapons using blaster as secondary attack load settings from blaster

See merge request xonotic/xonotic-data.pk3dir!1282

diff --cc qcsrc/common/weapons/weapon/electro.qc
index 684fa633ed3a2fd0e8b689e57d4a6b9a1c159f0c,2a53deb0a9006baa32fc93e857b72ad555397380..d45810c0864586556f71f9f039d473b9bd7b5032
--- 1/qcsrc/common/weapons/weapon/electro.qc
--- 2/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@@ -53,11 -53,10 +53,11 @@@ void W_Electro_TriggerCombo(vector org
  
  void W_Electro_ExplodeCombo(entity this)
  {
-       W_Electro_TriggerCombo(this.origin, WEP_CVAR(electro, combo_comboradius), this.realowner);
+       W_Electro_TriggerCombo(this.origin, WEP_CVAR(WEP_ELECTRO, combo_comboradius), this.realowner);
  
        this.event_damage = func_null;
 -      this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work
 +      if (!this.velocity)
 +              this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work
  
        RadiusDamage(
                this,