Merge branch 'master' into martin-t/bullet-trails

diff --cc qcsrc/common/effects/all.inc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/okshotgun.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/spiderbot.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shotgun.qc
index 1ee969bb8b9438c4bf27f5205e6b1a2e4ecedd20,c31a32de22222153480d38d42a73d8d5c97cefe6..eea1165ff8954181bcb4ddfc986dc9470be77e24
--- 1/qcsrc/common/weapons/weapon/shotgun.qc
--- 2/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@@ -6,10 -6,10 +6,9 @@@ void W_Shotgun_Attack(Weapon thiswep, e
  {
        W_DecreaseAmmo(thiswep, actor, ammocount, weaponentity);
  
-       W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), damage * bullets, WEP_SHOTGUN.m_id);
+       W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), damage * bullets, thiswep.m_id);
        for(int sc = 0;sc < bullets;sc = sc + 1)
-               fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, WEP_SHOTGUN.m_id, bullet_trail_effect);
 -              fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, 0);
--
++              fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, bullet_trail_effect);
  
        Send_Effect(EFFECT_SHOTGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, ammocount);
  

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge