Merge branch 'master' into TimePath/global_self

# Conflicts:
#	qcsrc/server/mutators/mutator_instagib.qc
#	qcsrc/server/mutators/mutator_instagib_items.qc

diff --cc qcsrc/common/movetypes/movetypes.qc
Simple merge

diff --cc qcsrc/common/movetypes/walk.qc
Simple merge

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

diff --cc qcsrc/server/mutators/mutator_instagib.qc
index ee9c6de8cebe2c8e9319168997d24b6d97880b16,3055dbf539b931e6137fdbc0c4cad513d26118c2..9aecd0e4e7e9917cbbd12bf1a04b359c8f9ad85e
--- 1/qcsrc/server/mutators/mutator_instagib.qc
--- 2/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -7,19 -7,29 +7,29 @@@
  
  #include "../../common/items/all.qc"
  
- void spawnfunc_item_minst_cells (void)
+ void spawnfunc_item_minst_cells()
 -{
 +{SELFPARAM();
        if (!g_instagib) { remove(self); return; }
-       if (!self.ammo_cells)
-               self.ammo_cells = autocvar_g_instagib_ammo_drop;
+       if (!self.ammo_cells) self.ammo_cells = autocvar_g_instagib_ammo_drop;
+       StartItemA(ITEM_VaporizerCells);
+ }
  
-       StartItemA (ITEM_VaporizerCells);
+ void instagib_invisibility()
+ {
+       self.strength_finished = autocvar_g_balance_powerup_strength_time;
+       StartItemA(ITEM_Invisibility);
  }
  
- void instagib_health_mega()
+ void instagib_extralife()
 -{
 +{SELFPARAM();
        self.max_health = 1;
-       StartItemA (ITEM_ExtraLife);
+       StartItemA(ITEM_ExtraLife);
+ }
+ 
+ void instagib_speed()
+ {
+       self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
+       StartItemA(ITEM_Speed);
  }
  
  .float instagib_nextthink;
@@@ -220,8 -230,8 +230,8 @@@ MUTATOR_HOOKFUNCTION(instagib_PlayerPow
  }
  
  MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics)
 -{
 +{SELFPARAM();
-       if(self.items & ITEM_Shield.m_itemid)
+       if(self.items & ITEM_Speed.m_itemid)
                self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_instagib_speed_highspeed;
  
        return false;
@@@ -425,9 -427,10 +424,10 @@@ MUTATOR_HOOKFUNCTION(instagib_ItemTouch
  }
  
  MUTATOR_HOOKFUNCTION(instagib_OnEntityPreSpawn)
 -{
 +{SELFPARAM();
        if (!autocvar_g_powerups) { return false; }
-       if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.itemdef == ITEM_HealthMega))
+       // Can't use .itemdef here
+       if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.classname == "item_health_mega"))
                return false;
  
        entity e = spawn();