Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -422,11 +422,13 @@
 	return ApplyValueModificationsToEntity("Attack/" + type + "/RepeatTime", repeatTime, this.entity);
 };
 
-Attack.prototype.GetTimers = function(type)
+Attack.prototype.GetTimers = function(type, random = true)
 {
+	let randomDelay = random ? randIntInclusive(0,100) : 0;
+
 	return {
-		"prepare": ApplyValueModificationsToEntity("Attack/" + type + "/PrepareTime", +(this.template[type].PrepareTime || 0), this.entity),
-		"repeat": this.GetRepeatTime(type)
+		"prepare": ApplyValueModificationsToEntity("Attack/" + type + "/PrepareTime", +(this.template[type].PrepareTime || 0), this.entity) + randomDelay,
+		"repeat": this.GetRepeatTime(type) + randomDelay
 	};
 };
 
Index: binaries/data/mods/public/simulation/components/BuildingAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/BuildingAI.js
+++ binaries/data/mods/public/simulation/components/BuildingAI.js
@@ -212,7 +212,7 @@
 		return;
 
 	var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-	var attackTimers = cmpAttack.GetTimers(attackType);
+	var attackTimers = cmpAttack.GetTimers(attackType, false);
 
 	this.timer = cmpTimer.SetInterval(this.entity, IID_BuildingAI, "FireArrows",
 		attackTimers.prepare, attackTimers.repeat / roundCount, null);
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js
+++ binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -489,7 +489,7 @@
 			ret.attack[type].maxRange = range.max;
 			ret.attack[type].yOrigin = cmpAttack.GetAttackYOrigin(type);
 
-			let timers = cmpAttack.GetTimers(type);
+			let timers = cmpAttack.GetTimers(type, false);
 			ret.attack[type].prepareTime = timers.prepare;
 			ret.attack[type].repeatTime = timers.repeat;
 
Index: binaries/data/mods/public/simulation/components/tests/test_Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -242,18 +242,18 @@
 		}
 	});
 
-	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Ranged"), {
-		"prepare": 300,
-		"repeat": 500
-	});
+	// TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Ranged"), {
+	// 	"prepare": 300,
+	// 	"repeat": 500
+	// });
 
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetRepeatTime("Ranged"), 500);
 
-	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Capture"), {
-		"prepare": 0,
-		"repeat": 1000
-	});
+	// TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Capture"), {
+	// 	"prepare": 0,
+	// 	"repeat": 1000
+	// });
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetRepeatTime("Capture"), 1000);