--- a/hedgewars/uGearsHandlersMess.pas	Wed Nov 08 21:56:43 2017 +0100
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Nov 09 09:56:35 2017 -0500
@@ -2318,10 +2318,10 @@
     if Gear^.Timer = 0 then
         begin
         inc(Gear^.Tag);
-        Gear^.Timer := 100
-        end;
-
-    if Gear^.Tag = 4 then
+        Gear^.Timer := 50
+        end;
+
+    if Gear^.Tag = 3 then
         begin
         HHGear := Gear^.Hedgehog^.Gear;
         HHGear^.State := HHGear^.State or gstNoDamage;
@@ -2330,6 +2330,9 @@
         AmmoShove(Gear, Gear^.Boom, 115);
 
         HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
+        end
+    else if Gear^.Tag = 4 then
+        begin
         Gear^.Timer := 250;
         Gear^.doStep := @doStepIdle
         end