Merge branch 'master' into martin-t/okc

diff --combined qcsrc/common/mutators/mutator/nades/nades.qc
index 63d98b4d6ea2edeb971988435daf61e8d8543fa4,ae1bbff6525cac70a7348eb46bc4049ae81c76a7..11926b36d025b263032e2c1cf6355094c1305802
--- 1/qcsrc/common/mutators/mutator/nades/nades.qc
--- 2/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -889,18 -889,20 +889,18 @@@ void toss_nade(entity e, bool set_owner
        delete(e.fake_nade);
        e.fake_nade = NULL;
  
 +      Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER, CPID_NADES);
 +
        makevectors(e.v_angle);
  
        // NOTE: always throw from first weapon entity?
        W_SetupShot(e, _nade.weaponentity_fld, false, false, SND_Null, CH_WEAPON_A, 0);
  
 -      Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER, CPID_NADES);
 -
        vector offset = (v_forward * autocvar_g_nades_throw_offset.x)
 -                                + (v_right * autocvar_g_nades_throw_offset.y)
 -                                + (v_up * autocvar_g_nades_throw_offset.z);
 -      if(autocvar_g_nades_throw_offset == '0 0 0')
 -              offset = '0 0 0';
 +                    + (v_right * autocvar_g_nades_throw_offset.y)
 +                    + (v_up * autocvar_g_nades_throw_offset.z);
  
 -      setorigin(_nade, w_shotorg + offset + (v_right * 25) * -1);
 +      setorigin(_nade, w_shotorg + offset);
        //setmodel(_nade, MDL_PROJECTILE_NADE);
        //setattachment(_nade, NULL, "");
        PROJECTILE_MAKETRIGGER(_nade);
@@@ -1479,11 -1481,6 +1479,6 @@@ MUTATOR_HOOKFUNCTION(nades, BuildMutato
        M_ARGV(0, string) = strcat(M_ARGV(0, string), ":Nades");
  }
  
- MUTATOR_HOOKFUNCTION(nades, BuildMutatorsPrettyString)
- {
-       M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Nades");
- }
- 
  MUTATOR_HOOKFUNCTION(nades, BuildGameplayTipsString)
  {
        M_ARGV(0, string) = strcat(M_ARGV(0, string), "\n\n^3nades^8 are enabled, press 'g' to use them\n");