Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -54,6 +54,7 @@
 				{ "name": "Cédric Houbart" },
 				{ "nick": "Chakakhan", "name": "Kenny Long" },
 				{ "nick": "Clockwork-Muse", "name": "Stephen A. Imhoff" },
+				{ "nick": "cpc", "name": "Clément Pit-Claudel" },
 				{ "nick": "Cracker78", "name": "Chad Heim" },
 				{ "nick": "Crynux", "name": "Stephen J. Fewer" },
 				{ "nick": "cwprogger" },
Index: binaries/data/mods/public/gui/session/input.js
===================================================================
--- binaries/data/mods/public/gui/session/input.js
+++ binaries/data/mods/public/gui/session/input.js
@@ -1625,8 +1625,11 @@
 	var idleUnits = Engine.GuiInterfaceCall("FindIdleUnits", data);
 	if (!idleUnits.length)
 	{
-		// TODO: display a message or play a sound to indicate no more idle units, or something
-		// Reset for next cycle
+		// TODO: display a message to indicate no more idle units, or something
+		Engine.GuiInterfaceCall("PlaySound", {
+			"name": "no_idle_unit",
+			"entity": g_ViewedPlayer
+		});
 		resetIdleUnit();
 		return;
 	}
Index: binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -93,6 +93,7 @@
       <defeated>interface/alarm/alarm_defeated.xml</defeated>
       <defeated_ally>interface/alarm/alarm_defeated_ally.xml</defeated_ally>
       <defeated_enemy>interface/alarm/alarm_defeated_enemy.xml</defeated_enemy>
+      <no_idle_unit>interface/alarm/alarm_no_idle_unit.xml</no_idle_unit>
     </SoundGroups>
   </Sound>
   <StatisticsTracker>