From eae41b1750b6c10204730aa7821ccadff6ea7d71 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Mon, 17 Aug 2015 19:37:24 +0100
Subject: [PATCH 1/2] Fix LST queue type.

---
 mods/cnc/rules/ships.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml
index b7a444e399..241184c76c 100644
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -41,7 +41,7 @@ LST:
 	Tooltip:
 		Name: Landing Craft
 	Buildable:
-		Queue: Vehicle
+		Queue: Vehicle.GDI
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 	Mobile:

From 8730a7f223143b93bde49ea18ad995facfa5cc85 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Mon, 17 Aug 2015 19:40:44 +0100
Subject: [PATCH 2/2] Fix WithCargo desync.

---
 OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs b/OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
index 7c1f189779..13f31b2783 100644
--- a/OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Traits
 		public object Create(ActorInitializer init) { return new WithCargo(init.Self, this); }
 	}
 
-	public class WithCargo : IRenderModifier
+	public class WithCargo : IRenderModifier, ITick
 	{
 		readonly Cargo cargo;
 		readonly IFacing facing;
@@ -45,6 +45,19 @@ namespace OpenRA.Mods.Cnc.Traits
 			body = self.Trait<IBodyOrientation>();
 		}
 
+		public void Tick(Actor self)
+		{
+			if (facing == null)
+				return;
+
+			foreach (var c in cargo.Passengers)
+			{
+				var cargoFacing = c.TraitOrDefault<IFacing>();
+				if (cargoFacing != null)
+					cargoFacing.Facing = facing.Facing;
+			}
+		}
+
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
 		{
 			foreach (var rr in r)
@@ -55,10 +68,6 @@ namespace OpenRA.Mods.Cnc.Traits
 			var i = 0;
 			foreach (var c in cargo.Passengers)
 			{
-				var cargoFacing = c.TraitOrDefault<IFacing>();
-				if (facing != null && cargoFacing != null)
-					cargoFacing.Facing = facing.Facing;
-
 				var cargoPassenger = c.Trait<Passenger>();
 				if (cargoInfo.DisplayTypes.Contains(cargoPassenger.Info.CargoType))
 				{