Remove ^EmpDisableMobile inherit.

mods/ts/rules/civilian-vehicles.yaml

@@ -90,6 +90,7 @@ BUS:
 	Mobile:
 		TurnSpeed: 5
 		Speed: 113
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 100
 	Armor:
@@ -114,6 +115,7 @@ PICK:
 	Mobile:
 		TurnSpeed: 5
 		Speed: 113
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 100
 	Armor:
@@ -138,6 +140,7 @@ CAR:
 	Mobile:
 		TurnSpeed: 5
 		Speed: 113
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 100
 	Armor:
@@ -162,6 +165,7 @@ WINI:
 	Mobile:
 		TurnSpeed: 5
 		Speed: 113
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 200
 	Armor:

mods/ts/rules/defaults.yaml

@@ -88,11 +88,6 @@
 	ExternalConditions@EMPDISABLE:
 		Conditions: empdisable
 
-^EmpDisableMobile:
-	Inherits: ^EmpDisable
-	Mobile:
-		RequiresCondition: !empdisable && !deployed && !loading
-
 ^Cloakable:
 	Cloak@EXTERNALCLOAK:
 		RequiresCondition: cloakgenerator || crate-cloak
@@ -401,7 +396,7 @@
 
 ^Cyborg:
 	Inherits@1: ^Infantry
-	Inherits@2: ^EmpDisableMobile
+	Inherits@2: ^EmpDisable
 	Inherits@3: ^HealsOnTiberium
 	ExplosionOnDamageTransition:
 		Weapon: CyborgExplode
@@ -425,6 +420,8 @@
 	SpeedMultiplier@CRITICAL:
 		RequiresCondition: criticalspeed
 		Modifier: 50
+	Mobile:
+		RequiresCondition: !empdisable
 
 ^CivilianInfantry:
 	Inherits@1: ^Infantry
@@ -441,7 +438,7 @@
 ^Vehicle:
 	Inherits@1: ^GainsExperience
 	Inherits@2: ^ExistsInWorld
-	Inherits@3: ^EmpDisableMobile
+	Inherits@3: ^EmpDisable
 	Inherits@4: ^Cloakable
 	Inherits@5: ^DamagedByVeins
 	Huntable:
@@ -461,6 +458,7 @@
 				PathingCost: 90
 		TurnSpeed: 5
 		Voice: Move
+		RequiresCondition: !empdisable
 	Selectable:
 		Bounds: 40,24
 	WithTextControlGroupDecoration:
@@ -784,7 +782,7 @@
 	ActorLostNotification:
 
 ^Train:
-	Inherits@1: ^EmpDisableMobile
+	Inherits@1: ^EmpDisable
 	Inherits@2: ^ExistsInWorld
 	Inherits@3: ^Cloakable
 	Huntable:
@@ -799,10 +797,10 @@
 		TurnSpeed: 5
 		Voice: Move
 		Speed: 113
+		RequiresCondition: !empdisable
 	Cargo:
 		Types: Infantry
 		UnloadVoice: Unload
-		LoadingCondition: loading
 	Health:
 		HP: 100
 	Armor:

mods/ts/rules/gdi-vehicles.yaml

@@ -14,6 +14,7 @@ APC:
 		Speed: 113
 		TerrainSpeeds:
 			Water: 80
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 200
 	Armor:

mods/ts/rules/nod-vehicles.yaml

@@ -84,6 +84,7 @@ TTNK:
 		TurnSpeed: 5
 		Speed: 85
 		Crushes: wall, crate, infantry
+		RequiresCondition: !empdisable && undeployed
 	Health:
 		HP: 350
 	Armor:
@@ -273,6 +274,7 @@ SAPC:
 	Mobile:
 		TurnSpeed: 5
 		Speed: 71
+		RequiresCondition: !empdisable && !loading
 	Health:
 		HP: 175
 	Armor:

mods/ts/rules/shared-vehicles.yaml

@@ -127,6 +127,7 @@ LPST:
 	Mobile:
 		Speed: 85
 		TurnSpeed: 5
+		RequiresCondition: !empdisable && undeployed
 	RevealsShroud:
 		Range: 7c0
 		MaxHeightDelta: 3