--- a/ChangeLog.txt	Mon Apr 17 07:12:00 2017 +0200
+++ b/ChangeLog.txt	Mon Apr 17 18:47:56 2017 +0200
@@ -36,7 +36,6 @@
  * Fixed hedgehogs saying “Missed” when drowning enemy without dealing damage
  * Fixed enemy saying "Missed” when giving poison without direct damage
  * Fixed incorrect time box tooltip when in Sudden Death
- * Foreign and computer hedgehogs oddly said revenge taunts instead of “Yes, Sir” on their start of turn
  * Various other fixes
 
 Highlander:

--- a/hedgewars/uTeams.pas	Mon Apr 17 07:12:00 2017 +0200
+++ b/hedgewars/uTeams.pas	Mon Apr 17 18:47:56 2017 +0200
@@ -331,7 +331,17 @@
 
 if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then
     begin
-    AddVoice(sndYesSir, CurrentTeam^.voicepack);
+    if CurrentTeam^.ExtDriven then
+        begin
+        if GetRandom(2) = 0 then
+             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+        end
+    else
+        begin
+        GetRandom(2); // needed to avoid extdriven desync
+        AddVoice(sndYesSir, CurrentTeam^.voicepack);
+        end;
     if cHedgehogTurnTime < 1000000 then
         ReadyTimeLeft:= cReadyDelay;
     s:= ansistring(CurrentTeam^.TeamName);
@@ -340,7 +350,11 @@
 else
     begin
     if TurnTimeLeft > 0 then
-        AddVoice(sndYesSir, CurrentTeam^.voicepack);
+        begin
+        if GetRandom(2) = 0 then
+             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+        end;
     ReadyTimeLeft:= 0
     end;
 end;