Merge branch 'master' into terencehill/accuracy_shotgun

# Conflicts:
#	qcsrc/server/g_damage.qc

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

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

diff --cc qcsrc/server/client.qc
index da256e8f406faeb95173f2dbd62d31cd26434dce,3333c04e49180286b6ef8806c91aa410baf0de1e..3688c4eceb49022b6cf05770addf58ff4635d305
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -2708,15 -2765,9 +2765,14 @@@ void PlayerPostThink (entity this
        }
  
        if (IS_PLAYER(this)) {
 +              if(this.death_time == time && IS_DEAD(this))
 +              {
 +                      this.maxs.z = 5;
 +                      setsize(this, this.mins, this.maxs);
 +              }
                DrownPlayer(this);
-               CheckRules_Player(this);
                UpdateChatBubble(this);
-               if (this.impulse) ImpulseCommands(this);
+               if (CS(this).impulse) ImpulseCommands(this);
                if (game_stopped)
                {
                        CSQCMODEL_AUTOUPDATE(this);

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

diff --cc qcsrc/server/g_damage.qc
index 6be1c7deaabdce0f0f441f4ffcad2ce0d218bbe4,029660c2bf05c2e98975f609e8c35d943d4f168d..713cf385dccc4387f6283b34433f064ea177cf55
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -542,8 -533,8 +533,8 @@@ void Freeze (entity targ, float revives
  
        STAT(FROZEN, targ) = frozen_type;
        targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
-       targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
+       SetResourceAmount(targ, RESOURCE_HEALTH, ((frozen_type == 3) ? targ_maxhealth : 1));
 -      targ.revive_speed = freeze_time;
 +      targ.revive_speed = revivespeed;
        if(targ.bot_attack)
                IL_REMOVE(g_bot_targets, targ);
        targ.bot_attack = false;

diff --cc qcsrc/server/player.qc
Simple merge

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

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