Merge remote branch 'origin/master' into samual/mutator_ctf

diff --combined qcsrc/server/miscfunctions.qc
index 7cedebcad2c99eb68efb3a5c4571d3984475f22e,1359c056692298f68ce457d95d13537e1398a9b8..00849718eb511887df5d7568e287f3b9e7977ddd
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -1128,6 -1128,7 +1128,6 @@@ void readlevelcvars(void
        g_bloodloss = cvar("g_bloodloss");
        sv_maxidle = cvar("sv_maxidle");
        sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
 -      g_ctf_reverse = cvar("g_ctf_reverse");
        sv_autotaunt = cvar("sv_autotaunt");
        sv_taunt = cvar("sv_taunt");
  
@@@ -1985,6 -1986,9 +1985,9 @@@ float WarpZone_Projectile_Touch_ImpactF
  }
  #define PROJECTILE_TOUCH if(WarpZone_Projectile_Touch()) return
  
+ #define ITEM_TOUCH_NEEDKILL() (((trace_dpstartcontents | trace_dphitcontents) & DPCONTENTS_NODROP) || (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY))
+ #define ITEM_DAMAGE_NEEDKILL(dt) (((dt) == DEATH_HURTTRIGGER) || ((dt) == DEATH_SLIME) || ((dt) == DEATH_LAVA) || ((dt) == DEATH_SWAMP))
+ 
  void URI_Get_Callback(float id, float status, string data)
  {
        if(url_URI_Get_Callback(id, status, data))
@@@ -2745,8 -2749,6 +2748,8 @@@ float isPushable(entity e
  {
        if(e.iscreature)
                return TRUE;
 +      if(e.pushable)
 +              return TRUE;
        switch(e.classname)
        {
                case "body":