Fix captured tech unlocking in TD.

mods/cnc/chrome.yaml

@@ -434,9 +434,9 @@ production-icons: chrome.png
 	building: 384,0,16,16
 	building-disabled: 384,16,16,16
 	building-alert: 384,32,16,16
-	defense: 400,0,16,16
+	defence: 400,0,16,16
-	defense-disabled: 400,16,16,16
+	defence-disabled: 400,16,16,16
-	defense-alert: 400,32,16,16
+	defence-alert: 400,32,16,16
 	infantry: 416,0,16,16
 	infantry-disabled: 416,16,16,16
 	infantry-alert: 416,32,16,16

mods/cnc/chrome/ingame.yaml

@@ -317,14 +317,14 @@ Container@PLAYER_WIDGETS:
 									X: 7
 									Y: 7
 									ImageCollection: production-icons
-						ProductionTypeButton@DEFENSE:
+						ProductionTypeButton@DEFENCE:
 							X: 35
 							Width: 30
 							Height: 30
 							Key: w
-							TooltipText: Defense
+							TooltipText: Defence
 							TooltipContainer: TOOLTIP_CONTAINER
-							ProductionGroup: Defense
+							ProductionGroup: Defence
 							Children:
 								Image@ICON:
 									X: 7

mods/cnc/rules/ai.yaml

@@ -10,6 +10,9 @@ Player:
 			Silo: silo
 		UnitsCommonNames:
 			Mcv: mcv
+		BuildingQueues: Building.Nod, Building.GDI
+		DefenseQueues: Defence.Nod, Defence.GDI
+		UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI
 		BuildingLimits:
 			proc: 4
 			pyle: 2
@@ -72,6 +75,9 @@ Player:
 			Silo: silo
 		UnitsCommonNames:
 			Mcv: mcv
+		BuildingQueues: Building.Nod, Building.GDI
+		DefenseQueues: Defence.Nod, Defence.GDI
+		UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI
 		BuildingLimits:
 			proc: 4
 			pyle: 2
@@ -134,6 +140,9 @@ Player:
 			Silo: silo
 		UnitsCommonNames:
 			Mcv: mcv
+		BuildingQueues: Building.Nod, Building.GDI
+		DefenseQueues: Defence.Nod, Defence.GDI
+		UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI
 		BuildingLimits:
 			proc: 4
 			pyle: 2
@@ -187,4 +196,3 @@ Player:
 			htnk: 50%
 			orca: 10%
 		SquadSize: 8
-

mods/cnc/rules/aircraft.yaml

@@ -8,7 +8,7 @@ TRAN:
 	Buildable:
 		BuildPaletteOrder: 10
 		Prerequisites: hpad
-		Owner: gdi,nod
+		Queue: Aircraft.GDI, Aircraft.Nod
 	Selectable:
 		Bounds: 41,41
 	Helicopter:
@@ -52,7 +52,7 @@ HELI:
 	Buildable:
 		BuildPaletteOrder: 20
 		Prerequisites: hpad, anyhq
-		Owner: nod
+		Queue: Aircraft.Nod
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
@@ -104,7 +104,7 @@ ORCA:
 	Buildable:
 		BuildPaletteOrder: 20
 		Prerequisites: hpad, anyhq
-		Owner: gdi
+		Queue: Aircraft.GDI
 	Selectable:
 		Bounds: 30,24
 	Helicopter:

mods/cnc/rules/defaults.yaml

@@ -15,8 +15,6 @@
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground, Vehicle
-	Buildable:
-		Queue: Vehicle
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -61,8 +59,6 @@
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground, Vehicle
-	Buildable:
-		Queue: Vehicle
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -106,8 +102,6 @@
 		RepairBuildings: hpad
 		RearmBuildings:
 		LandWhenIdle: false
-	Buildable:
-		Queue: Aircraft
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
@@ -153,8 +147,6 @@
 		Voice: GenericVoice
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
-	Buildable:
-		Queue: Infantry
 	TakeCover:
 		ProneSpeed: 0.6
 	RenderInfantryProne:
@@ -198,7 +190,6 @@
 
 ^CivInfantry:
 	Inherits: ^Infantry
-	-Buildable:
 	-AutoTarget:
 	-TakeCover:
 	-RenderInfantryProne:
@@ -237,7 +228,6 @@
 	Buildable:
 		Queue: Biolab
 		BuildPaletteOrder: 50
-		Owner: gdi, nod
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -369,8 +359,6 @@
 ^BaseBuilding:
 	Inherits: ^Building
 	MustBeDestroyed:
-	Buildable:
-		Queue: Building
 	RepairableBuilding:
 		RepairPercent: 40
 		RepairStep: 14

mods/cnc/rules/infantry.yaml

@@ -7,7 +7,7 @@ E1:
 		Description: General-purpose infantry.\n  Strong vs Infantry\n  Weak vs Vehicles
 	Buildable:
 		BuildPaletteOrder: 10
-		Owner: gdi, nod
+		Queue: Infantry.GDI, Infantry.Nod
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -31,7 +31,7 @@ E2:
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: anyhq
-		Owner: gdi
+		Queue: Infantry.GDI
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -60,7 +60,7 @@ E3:
 		Description: Anti-tank/Anti-aircraft infantry. \n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
 	Buildable:
 		BuildPaletteOrder: 20
-		Owner: nod, gdi
+		Queue: Infantry.GDI, Infantry.Nod
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -87,8 +87,8 @@ E4:
 		Description: Advanced Anti-infantry unit.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks
 	Buildable:
 		BuildPaletteOrder: 40
-		Owner: nod
 		Prerequisites: anyhq
+		Queue: Infantry.Nod
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -117,8 +117,8 @@ E5:
 		Description: Advanced general-purpose infantry.\n  Strong vs all Ground units
 	Buildable:
 		BuildPaletteOrder: 50
-		Owner: nod
 		Prerequisites: tmpl
+		Queue: Infantry.Nod
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -153,7 +153,7 @@ E6:
 		Description: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
 	Buildable:
 		BuildPaletteOrder: 30
-		Owner: gdi,nod
+		Queue: Infantry.GDI, Infantry.Nod
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
@@ -181,8 +181,8 @@ RMBO:
 		Description: Elite sniper infantry unit.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles
 	Buildable:
 		BuildPaletteOrder: 50
-		Owner: gdi
 		Prerequisites: eye
+		Queue: Infantry.GDI
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: CommandoVoice
@@ -215,7 +215,6 @@ PVICE:
 	Buildable:
 		Queue: Biolab
 		BuildPaletteOrder: 40
-		Owner: gdi, nod
 	Tooltip:
 		Description: Mutated abomination that spits liquid tiberium.\n  Strong vs Infantry, Buildings\n  Weak vs Aircraft
 	DrawLineToTarget:

mods/cnc/rules/structures.yaml

@@ -1,7 +1,7 @@
 FACT:
 	Inherits: ^BaseBuilding
 	Buildable:
-		Queue: Building
+		Queue: Building.GDI, Building.Nod
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 	Valued:
@@ -21,30 +21,56 @@ FACT:
 		Range: 10c0
 	Bib:
 	Production:
-		Produces: Building,Defense
+		Produces: Building.GDI, Buildings.Nod, Defence.GDI, Defence.Nod
 	Transforms:
 		IntoActor: mcv
 		Offset: 1,1
 		Facing: 108
-	ProductionQueue@Building:
+	ProductionQueue@GDIBuilding:
-		Type: Building
+		Type: Building.GDI
+		Race: gdi
+		RequireOwner: false
 		Group: Building
 		BuildSpeed: .4
 		LowPowerSlowdown: 2
 		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
-	ProductionQueue@Defense:
+	ProductionQueue@NodBuilding:
-		Type: Defense
+		Type: Building.Nod
-		Group: Defense
+		Race: nod
+		RequireOwner: false
+		Group: Building
+		BuildSpeed: .4
+		LowPowerSlowdown: 2
+		QueuedAudio: Building
+		ReadyAudio: ConstructionComplete
+	ProductionQueue@GDIDefense:
+		Type: Defence.GDI
+		Race: gdi
+		RequireOwner: false
+		Group: Defence
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+		QueuedAudio: Building
+		ReadyAudio: ConstructionComplete
+	ProductionQueue@NodDefense:
+		Type: Defence.Nod
+		Race: nod
+		RequireOwner: false
+		Group: Defence
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
 	BaseBuilding:
-	ProductionBar@Building:
+	ProductionBar@BuildingGDI:
-		ProductionType: Building
+		ProductionType: Building.GDI
-	ProductionBar@Defense:
+	ProductionBar@BuildingNod:
-		ProductionType: Defense
+		ProductionType: Building.Nod
+	ProductionBar@DefenceGDI:
+		ProductionType: Defence.GDI
+	ProductionBar@DefenceNod:
+		ProductionType: Defence.Nod
 	BaseProvider:
 		Cooldown: 75
 		Range: 14
@@ -61,8 +87,8 @@ NUKE:
 		Prerequisite: anypower
 	Buildable:
 		BuildPaletteOrder: 10
-		Owner: gdi,nod
 		Prerequisites: fact
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: 100
 		Footprint: x_ xx
@@ -85,7 +111,7 @@ NUK2:
 	Buildable:
 		BuildPaletteOrder: 30
 		Prerequisites: anyhq
-		Owner: gdi,nod
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: 200
 		Footprint: xx xx
@@ -106,7 +132,7 @@ PROC:
 	Buildable:
 		BuildPaletteOrder: 20
 		Prerequisites: anypower
-		Owner: gdi,nod
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: -50
 		Footprint: _x_ xxx ===
@@ -142,10 +168,9 @@ SILO:
 		Name: Tiberium Silo
 		Description: Stores processed Tiberium
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 35
 		Prerequisites: proc
-		Owner: gdi,nod
+		Queue: Defence.GDI, Defence.Nod
 	Building:
 		Power: -10
 		Footprint: xx
@@ -179,7 +204,7 @@ PYLE:
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: anypower
-		Owner: gdi
+		Queue: Building.GDI
 	Building:
 		Power: -20
 		Footprint: xx xx
@@ -197,10 +222,11 @@ PYLE:
 		SpawnOffset: 298,298,0
 		ExitCell: 1,1
 	Production:
-		Produces: Infantry
+		Produces: Infantry.GDI
 	ProductionQueue:
-		Type: Infantry
+		Type: Infantry.GDI
 		Group: Infantry
+		RequireOwner: false
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	ProductionBar:
@@ -217,7 +243,7 @@ HAND:
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: anypower
-		Owner: nod
+		Queue: Building.Nod
 	Building:
 		Power: -20
 		Footprint: __ xx xx
@@ -232,10 +258,11 @@ HAND:
 		SpawnOffset: 512,1024,0
 		ExitCell: 1,2
 	Production:
-		Produces: Infantry
+		Produces: Infantry.Nod
 	ProductionQueue:
-		Type: Infantry
+		Type: Infantry.Nod
 		Group: Infantry
+		RequireOwner: false
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	ProductionBar:
@@ -252,7 +279,7 @@ AFLD:
 	Buildable:
 		BuildPaletteOrder: 50
 		Prerequisites: proc
-		Owner: nod
+		Queue: Building.Nod
 	Building:
 		Power: -30
 		Footprint: xxxx xxxx
@@ -268,11 +295,12 @@ AFLD:
 		SpawnOffset: -1024,0,0
 		ExitCell: 3,1
 	ProductionAirdrop:
-		Produces: Vehicle
+		Produces: Vehicle.Nod
 	WithDeliveryAnimation:
 	ProductionQueue:
-		Type: Vehicle
+		Type: Vehicle.Nod
 		Group: Vehicle
+		RequireOwner: false
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		ReadyAudio:
@@ -290,7 +318,7 @@ WEAP:
 	Buildable:
 		BuildPaletteOrder: 50
 		Prerequisites: proc
-		Owner: gdi
+		Queue: Building.GDI
 	Building:
 		Power: -30
 		Footprint: ___ xxx ===
@@ -308,9 +336,10 @@ WEAP:
 		SpawnOffset: -341,-341,0
 		ExitCell: 0,2
 	Production:
-		Produces: Vehicle
+		Produces: Vehicle.GDI
 	ProductionQueue:
-		Type: Vehicle
+		Type: Vehicle.GDI
+		RequireOwner: false
 		Group: Vehicle
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
@@ -326,7 +355,7 @@ HPAD:
 	Buildable:
 		BuildPaletteOrder: 60
 		Prerequisites: proc
-		Owner: gdi,nod
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: -10
 		Footprint: xx xx
@@ -338,17 +367,29 @@ HPAD:
 	Exit@1:
 		SpawnOffset: 0,-256,0
 	Production:
-		Produces: Aircraft
+		Produces: Aircraft.GDI, Aircraft.Nod
 	Reservable:
 	RepairsUnits:
 	WithRepairAnimation:
 	RallyPoint:
-	ProductionQueue:
+	ProductionQueue@GDI:
-		Type: Aircraft
+		Type: Aircraft.GDI
+		Race: gdi
 		Group: Aircraft
+		RequireOwner: false
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
-	ProductionBar:
+	ProductionQueue@Nod:
+		Type: Aircraft.Nod
+		Race: nod
+		Group: Aircraft
+		RequireOwner: false
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionBar@GDI:
+		ProductionType: Aircraft.GDI
+	ProductionBar@Nod:
+		ProductionType: Aircraft.Nod
 
 HQ:
 	Inherits: ^BaseBuilding
@@ -362,7 +403,7 @@ HQ:
 	Buildable:
 		BuildPaletteOrder: 70
 		Prerequisites: proc
-		Owner: gdi,nod
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: -40
 		Footprint: x_ xx
@@ -410,7 +451,7 @@ FIX:
 	Buildable:
 		BuildPaletteOrder: 80
 		Prerequisites: vehicleproduction
-		Owner: gdi,nod
+		Queue: Building.GDI, Building.Nod
 	Building:
 		Power: -30
 		Footprint: _x_ xxx _x_
@@ -438,7 +479,7 @@ EYE:
 	Buildable:
 		BuildPaletteOrder: 100
 		Prerequisites: anyhq
-		Owner: gdi
+		Queue: Building.GDI
 	Building:
 		Power: -200
 		Footprint: x_ xx
@@ -483,7 +524,7 @@ TMPL:
 	Buildable:
 		BuildPaletteOrder: 100
 		Prerequisites: anyhq
-		Owner: nod
+		Queue: Building.Nod
 	Building:
 		Power: -150
 		Footprint: ___ xxx xxx
@@ -525,10 +566,9 @@ GUN:
 		Name: Turret
 		Description: Basic Anti-Tank base defense.\n  Strong vs Tanks, vehicles\n  Weak vs Infantry
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 45
 		Prerequisites: barracks
-		Owner: gdi,nod
+		Queue: Defence.GDI, Defence.Nod
 	Building:
 		Power: -20
 	-GivesBuildableArea:
@@ -568,10 +608,9 @@ SAM:
 		Name: SAM Site
 		Description: Anti-Aircraft base defense.\n  Strong vs Aircraft\n  Cannot target Ground units.
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 50
 		Prerequisites: hand
-		Owner: nod
+		Queue: Defence.Nod
 	Building:
 		Power: -20
 		Footprint: xx
@@ -608,10 +647,9 @@ OBLI:
 		Name: Obelisk of Light
 		Description: Advanced base defense. \nRequires power to operate.\n  Strong vs all Ground units\n  Cannot target Aircraft
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 60
 		Prerequisites: tmpl
-		Owner: nod
+		Queue: Defence.Nod
 	Building:
 		Power: -150
 		Footprint: _ x
@@ -654,10 +692,9 @@ GTWR:
 		Name: Guard Tower
 		Description: Basic defensive structure.\n  Strong vs Infantry\n  Weak vs Tanks
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 40
 		Prerequisites: barracks
-		Owner: gdi,nod
+		Queue: Defence.GDI
 	Building:
 		Power: -10
 	-GivesBuildableArea:
@@ -693,10 +730,9 @@ ATWR:
 		Name: Advanced Guard Tower
 		Description: All-purpose defensive structure.\n  Strong vs Aircraft, Tanks\n  Weak vs Infantry
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 60
 		Prerequisites: anyhq
-		Owner: gdi
+		Queue: Defence.GDI
 	Building:
 		Power: -40
 		Footprint: _ x
@@ -742,10 +778,9 @@ SBAG:
 		Name: Sandbag Barrier
 		Description: Stops infantry & light vehicles. \nCan be crushed by tanks.
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 20
 		Prerequisites: fact
-		Owner: gdi
+		Queue: Defence.GDI
 	Health:
 		HP: 100
 	Armor:
@@ -768,10 +803,9 @@ CYCL:
 		Name: Chain Link Barrier
 		Description: Stops infantry & light vehicles. \nCan be crushed by tanks.
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 20
 		Prerequisites: fact
-		Owner: nod
+		Queue: Defence.Nod
 	Health:
 		HP: 100
 	Armor:
@@ -794,10 +828,9 @@ BRIK:
 		Name: Concrete Barrier
 		Description: Stop units.
 	Buildable:
-		Queue: Defense
 		BuildPaletteOrder: 30
 		Prerequisites: vehicleproduction
-		Owner: gdi,nod
+		Queue: Defence.GDI, Defence.Nod
 	Health:
 		HP: 250
 	Armor:

mods/cnc/rules/tech.yaml

@@ -61,6 +61,7 @@ BIO:
 	ProductionQueue:
 		Type: Biolab
 		Group: Infantry
+		RequireOwner: false
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	ProductionBar:

mods/cnc/rules/vehicles.yaml

@@ -8,7 +8,7 @@ MCV:
 	Buildable:
 		BuildPaletteOrder: 100
 		Prerequisites: anyhq
-		Owner: gdi,nod
+		Queue: Vehicle.GDI, Vehicle.Nod
 	Selectable:
 		Priority: 3
 	Mobile:
@@ -47,7 +47,7 @@ HARV:
 	Buildable:
 		BuildPaletteOrder: 10
 		Prerequisites: proc
-		Owner: gdi,nod
+		Queue: Vehicle.GDI, Vehicle.Nod
 	Selectable:
 		Priority: 7
 		Bounds: 36,36
@@ -84,7 +84,7 @@ APC:
 	Buildable:
 		BuildPaletteOrder: 30
 		Prerequisites: pyle
-		Owner: gdi
+		Queue: Vehicle.GDI
 	Mobile:
 		ROT: 8
 		Speed: 128
@@ -131,7 +131,7 @@ ARTY:
 	Buildable:
 		BuildPaletteOrder: 60
 		Prerequisites: anyhq
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 2
 		Speed: 85
@@ -167,7 +167,7 @@ FTNK:
 	Buildable:
 		BuildPaletteOrder: 50
 		Prerequisites: anyhq
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 7
 		Speed: 113
@@ -203,7 +203,7 @@ BGGY:
 	Buildable:
 		BuildPaletteOrder: 20
 		Prerequisites: afld
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 10
 		Speed: 170
@@ -238,7 +238,7 @@ BIKE:
 	Buildable:
 		BuildPaletteOrder: 30
 		Prerequisites: afld
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 10
 		Speed: 213
@@ -275,7 +275,7 @@ JEEP:
 	Buildable:
 		BuildPaletteOrder: 20
 		Prerequisites: weap
-		Owner: gdi
+		Queue: Vehicle.GDI
 	Mobile:
 		ROT: 10
 		Speed: 156
@@ -310,7 +310,7 @@ LTNK:
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: anyhq
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 7
 		Speed: 113
@@ -349,7 +349,7 @@ MTNK:
 	Buildable:
 		BuildPaletteOrder: 40
 		Prerequisites: anyhq
-		Owner: gdi
+		Queue: Vehicle.GDI
 	Mobile:
 		Speed: 85
 	Health:
@@ -389,7 +389,7 @@ HTNK:
 	Buildable:
 		BuildPaletteOrder: 60
 		Prerequisites: eye
-		Owner: gdi
+		Queue: Vehicle.GDI
 	Mobile:
 		Crushes: wall, heavywall, crate, infantry
 		Speed: 56
@@ -442,7 +442,7 @@ MSAM:
 	Buildable:
 		BuildPaletteOrder: 50
 		Prerequisites: anyhq
-		Owner: gdi
+		Queue: Vehicle.GDI
 	Mobile:
 		Speed: 85
 		ROT: 4
@@ -479,7 +479,7 @@ MLRS:
 	Buildable:
 		BuildPaletteOrder: 70
 		Prerequisites: anyhq
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		Speed: 99
 		ROT: 7
@@ -519,7 +519,7 @@ STNK:
 	Buildable:
 		BuildPaletteOrder: 90
 		Prerequisites: tmpl
-		Owner: nod
+		Queue: Vehicle.Nod
 	Mobile:
 		ROT: 10
 		Speed: 142