diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 14ba32a524..8767e17ce7 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -503,6 +503,7 @@
+
diff --git a/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs b/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs
new file mode 100644
index 0000000000..c1277fd55f
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs
@@ -0,0 +1,58 @@
+#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 System.Collections.Generic;
+using OpenRA.Mods.Common.Activities;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+ [Desc("Put this on the actor that gets crushed to replace the crusher with a new actor.")]
+ public class TransformCrusherOnCrushInfo : ITraitInfo
+ {
+ [ActorReference, FieldLoader.Require] public readonly string IntoActor = null;
+
+ public readonly bool SkipMakeAnims = true;
+
+ public readonly HashSet CrushClasses = new HashSet();
+
+ public virtual object Create(ActorInitializer init) { return new TransformCrusherOnCrush(init, this); }
+ }
+
+ public class TransformCrusherOnCrush : INotifyCrushed
+ {
+ readonly TransformCrusherOnCrushInfo info;
+ readonly string faction;
+
+ public TransformCrusherOnCrush(ActorInitializer init, TransformCrusherOnCrushInfo info)
+ {
+ this.info = info;
+ faction = init.Contains() ? init.Get() : init.Self.Owner.Faction.InternalName;
+ }
+
+ void INotifyCrushed.WarnCrush(Actor self, Actor crusher, HashSet crushClasses) { }
+
+ void INotifyCrushed.OnCrush(Actor self, Actor crusher, HashSet crushClasses)
+ {
+ if (!info.CrushClasses.Overlaps(crushClasses))
+ return;
+
+ var facing = crusher.TraitOrDefault();
+ var transform = new Transform(crusher, info.IntoActor) { Faction = faction };
+ if (facing != null)
+ transform.Facing = facing.Facing;
+
+ transform.SkipMakeAnims = info.SkipMakeAnims;
+ if (crusher.CancelActivity())
+ crusher.QueueActivity(transform);
+ }
+ }
+}