Merge branch 'pending-release' into LegendaryGuard/rename_weapon_filenames

diff --cc qcsrc/client/hud/crosshair.qc
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/common/weapons/weapon/machinegun.qc
index 4bc0fb3808fe39067eb50e7380de448be1bab0f8,efb4913c005ea7abd84a338ea7d67727b5933956..5637191e749bb619d532811779bd3174c8721d59
--- 1/qcsrc/common/weapons/weapon/machinegun.qc
--- 2/qcsrc/common/weapons/weapon/machinegun.qc
+++ b/qcsrc/common/weapons/weapon/machinegun.qc
@@@ -4,7 -4,8 +4,8 @@@
  
  void W_MachineGun_Attack(Weapon thiswep, int deathtype, entity actor, .entity weaponentity)
  {
 -      W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(machinegun, first_damage) : WEP_CVAR(machinegun, sustained_damage)), deathtype);
 +      W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(machinegun, first_damage) : WEP_CVAR(machinegun, sustained_damage)), deathtype);
+ 
        if(!autocvar_g_norecoil)
        {
                actor.punchangle_x = random() - 0.5;

diff --cc qcsrc/common/weapons/weapon/machinegun.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/rifle.qc
index 2f2e48cc6a40542dc5b3eb1257d99871de8dff80,265a27b93761d7af799e9ac9d9d10a0e208764e6..7fce63d4a534d422e20352645268deec988a3e42
--- 1/qcsrc/common/weapons/weapon/rifle.qc
--- 2/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@@ -30,12 -44,12 +44,12 @@@ void W_Rifle_FireBullet(Weapon thiswep
  
  void W_Rifle_Attack(Weapon thiswep, entity actor, .entity weaponentity)
  {
-       W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_PRI(rifle, spread), WEP_CVAR_PRI(rifle, damage), WEP_CVAR_PRI(rifle, headshot_multiplier), WEP_CVAR_PRI(rifle, force), WEP_CVAR_PRI(rifle, solidpenetration), WEP_CVAR_PRI(rifle, ammo), thiswep.m_id, WEP_CVAR_PRI(rifle, tracer), WEP_CVAR_PRI(rifle, shots), SND_RIFLE_FIRE, actor);
 -      W_Rifle_FireBullet(thiswep, weaponentity, thiswep.m_id, SND_CAMPINGRIFLE_FIRE, actor, true);
++      W_Rifle_FireBullet(thiswep, weaponentity, thiswep.m_id, SND_RIFLE_FIRE, actor, true);
  }
  
  void W_Rifle_Attack2(Weapon thiswep, entity actor, .entity weaponentity)
  {
-       W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_SEC(rifle, spread), WEP_CVAR_SEC(rifle, damage), WEP_CVAR_SEC(rifle, headshot_multiplier), WEP_CVAR_SEC(rifle, force), WEP_CVAR_SEC(rifle, solidpenetration), WEP_CVAR_SEC(rifle, ammo), thiswep.m_id | HITTYPE_SECONDARY, WEP_CVAR_SEC(rifle, tracer), WEP_CVAR_SEC(rifle, shots), SND_RIFLE_FIRE2, actor);
 -      W_Rifle_FireBullet(thiswep, weaponentity, thiswep.m_id | HITTYPE_SECONDARY, SND_CAMPINGRIFLE_FIRE2, actor, false);
++      W_Rifle_FireBullet(thiswep, weaponentity, thiswep.m_id | HITTYPE_SECONDARY, SND_RIFLE_FIRE2, actor, false);
  }
  
  .void(Weapon thiswep, entity actor, .entity weaponentity) rifle_bullethail_attackfunc;

diff --cc qcsrc/common/weapons/weapon/rifle.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/vortex.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vortex.qh
Simple merge