diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index a91a1241f1..af0c473e79 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -317,6 +317,7 @@
     <Compile Include="Traits\GrantExternalConditionToProduced.cs" />
     <Compile Include="Traits\Multipliers\CreatesShroudMultiplier.cs" />
     <Compile Include="Traits\Multipliers\RevealsShroudMultiplier.cs" />
+    <Compile Include="Traits\Conditions\GrantConditionWhileAiming.cs" />
     <Compile Include="Traits\RepairsUnits.cs" />
     <Compile Include="Traits\Rearmable.cs" />
     <Compile Include="Traits\Burns.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionWhileAiming.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionWhileAiming.cs
new file mode 100644
index 0000000000..5731a92dde
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionWhileAiming.cs
@@ -0,0 +1,55 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	public class GrantConditionWhileAimingInfo : ITraitInfo
+	{
+		[FieldLoader.Require]
+		[GrantedConditionReference]
+		[Desc("The condition to grant while aiming.")]
+		public readonly string Condition = null;
+
+		object ITraitInfo.Create(ActorInitializer init) { return new GrantConditionWhileAiming(this); }
+	}
+
+	public class GrantConditionWhileAiming : INotifyCreated, INotifyAiming
+	{
+		readonly GrantConditionWhileAimingInfo info;
+
+		ConditionManager conditionManager;
+		int conditionToken = ConditionManager.InvalidConditionToken;
+
+		public GrantConditionWhileAiming(GrantConditionWhileAimingInfo info)
+		{
+			this.info = info;
+		}
+
+		void INotifyCreated.Created(Actor self)
+		{
+			conditionManager = self.TraitOrDefault<ConditionManager>();
+		}
+
+		void INotifyAiming.StartedAiming(Actor self, AttackBase attack)
+		{
+			if (conditionToken == ConditionManager.InvalidConditionToken)
+				conditionToken = conditionManager.GrantCondition(self, info.Condition);
+		}
+
+		void INotifyAiming.StoppedAiming(Actor self, AttackBase attack)
+		{
+			if (conditionToken != ConditionManager.InvalidConditionToken)
+				conditionToken = conditionManager.RevokeCondition(self, conditionToken);
+		}
+	}
+}