Merge branch 'Lyberta/Survival' into Lyberta/master

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

diff --cc qcsrc/common/mutators/mutator/overkill/hmg.qh
Simple merge

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

diff --cc qcsrc/common/mutators/mutator/overkill/rpc.qh
Simple merge

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

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/shotgun.qc
index 1663cd21f1b8c8f7ba97a910d374852c7f6c4e9d,9ffef64287ca8cfe7841bebc53c46a0232de05aa..a3f9c111a8bbb71792158331cf547e7dc24d15f8
--- 1/qcsrc/common/weapons/weapon/shotgun.qc
--- 2/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@@ -1,17 -1,16 +1,16 @@@
  #include "shotgun.qh"
  
  #ifdef SVQC
- spawnfunc(weapon_shotgun) { weapon_defaultspawnfunc(this, WEP_SHOTGUN); }
  
 -void W_Shotgun_Attack(Weapon thiswep, entity actor, .entity weaponentity, float isprimary)
 +void W_Shotgun_Attack(Weapon thiswep, entity actor, .entity weaponentity, float isprimary, float ammocount, float damage, float bullets, float spread, float solidpenetration, float force)
  {
 -      W_DecreaseAmmo(thiswep, actor, WEP_CVAR_PRI(shotgun, ammo), weaponentity);
 +      W_DecreaseAmmo(thiswep, actor, ammocount, weaponentity);
  
 -      W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), WEP_CVAR_PRI(shotgun, damage) * WEP_CVAR_PRI(shotgun, bullets));
 -      for(int sc = 0;sc < WEP_CVAR_PRI(shotgun, bullets);sc = sc + 1)
 -              fireBullet(actor, weaponentity, w_shotorg, w_shotdir, WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, damage), WEP_CVAR_PRI(shotgun, force), WEP_SHOTGUN.m_id, 0);
 +      W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), damage * bullets);
 +      for(int sc = 0;sc < bullets;sc = sc + 1)
 +              fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, WEP_SHOTGUN.m_id, 0);
  
 -      Send_Effect(EFFECT_SHOTGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, WEP_CVAR_PRI(shotgun, ammo));
 +      Send_Effect(EFFECT_SHOTGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, ammocount);
  
        // casing code
        if(autocvar_g_casings >= 1)

diff --cc qcsrc/server/defs.qh
Simple merge