diff --git a/mods/sp/rules/defaults.yaml b/mods/sp/rules/defaults.yaml
index 9b5209d0e..9e5c45f10 100644
--- a/mods/sp/rules/defaults.yaml
+++ b/mods/sp/rules/defaults.yaml
@@ -2059,11 +2059,13 @@
 	Inherits: ^DroneSoldier
 	Mobile:
 		Locomotor: HoverInfantry
-	KillsSelf@DisabledOnWater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
 	GrantConditionOnTerrain:
 		Condition: hoverunitonwater
 		TerrainTypes: Water
+	Hovers:
+		RequiresCondition: !WebDisable && !empdisable
+	KillsSelf@DisabledOnWater:
+		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
 	LeavesTrails:
 		RequiresCondition: hoverunitonwater
 		Image: wake
@@ -2082,10 +2084,14 @@
 		RequiresCondition: !hoverunitonwater
 	SpawnActorOnDeath@conversionUpg:
 		RequiresCondition: !hoverunitonwater
-	-DamagedByTintedCells@Default:
-	-DamagedByTintedCells@BlueRadiation:
-	-DamagedByTintedCells@OrangeRadiation:
-	-DamagedByTintedCells@Colossus:
+	DamagedByTintedCells@Default:
+		RequiresCondition: WebDisable || empdisable
+	DamagedByTintedCells@BlueRadiation:
+		RequiresCondition: WebDisable || empdisable
+	DamagedByTintedCells@OrangeRadiation:
+		RequiresCondition: WebDisable || empdisable
+	DamagedByTintedCells@Colossus:
+		RequiresCondition: WebDisable || empdisable
 
 ^CivilianInfantry:
 	Inherits: ^Infantry
@@ -2359,6 +2365,10 @@
 ^HoverVehicle:
 	Inherits: ^Vehicle
 	Hovers:
+		RequiresCondition: !empdisable
+	GrantConditionOnTerrain:
+		Condition: hoverunitonwater
+		TerrainTypes: Water
 	Mobile:
 		Locomotor: Hover
 		TurnsWhileMoving: true
@@ -2367,7 +2377,7 @@
 		BackwardDuration: 5
 		MaxBackwardCells: -1
 	LeavesTrails@water:
-		RequiresCondition: hoverunitonwater && !inside-tunnel
+		RequiresCondition: hoverunitonwater && !inside-tunnel && !empdisable
 		Image: hoverwind
 		Sequences: water
 		Palette: effect
@@ -2379,7 +2389,7 @@
 		SpawnAtLastPosition: false
 		StartDelay: -1
 	LeavesTrails@land:
-		RequiresCondition: !hoverunitonwater && !inside-tunnel
+		RequiresCondition: !hoverunitonwater && !inside-tunnel && !empdisable
 		Image: hoverwind
 		Sequences: non-water
 		Palette: effect
@@ -2390,9 +2400,6 @@
 		SpawnAtLastPosition: false
 		TrailWhileStationary: true
 		StartDelay: -1
-	GrantConditionOnTerrain:
-		Condition: hoverunitonwater
-		TerrainTypes: Water
 	ExplodesAlsoTransported:
 		RequiresCondition: !hoverunitonwater || !empdisable
 	KillsSelf@DisabledOnWater:
@@ -2402,14 +2409,18 @@
 		Weapon: UnitDrowned
 	ThrowsShrapnel:
 		RequiresCondition: !hoverunitonwater || !empdisable
-	-ChangesHealth@veinholedrain:
-	-ExternalCondition@veinholedrain:
-	-WithIdleOverlay@veinholedrain:
-	-GrantConditionOnTerrain@VEINS:
-	-DamagedByTintedCells@Default:
-	-DamagedByTintedCells@BlueRadiation:
-	-DamagedByTintedCells@OrangeRadiation:
-	-DamagedByTintedCells@Colossus:
+	ChangesHealth@veinholedrain:
+		RequiresCondition: empdisable && veinholedrain
+	WithIdleOverlay@veinholedrain:
+		RequiresCondition: empdisable && veinholedrain
+	DamagedByTintedCells@Default:
+		RequiresCondition: empdisable
+	DamagedByTintedCells@BlueRadiation:
+		RequiresCondition: empdisable
+	DamagedByTintedCells@OrangeRadiation:
+		RequiresCondition: empdisable
+	DamagedByTintedCells@Colossus:
+		RequiresCondition: empdisable
 
 ^HoverTank:
 	Inherits: ^HoverVehicle
diff --git a/mods/sp/rules/infantry.yaml b/mods/sp/rules/infantry.yaml
index 7e2af4413..057bf29c9 100644
--- a/mods/sp/rules/infantry.yaml
+++ b/mods/sp/rules/infantry.yaml
@@ -1700,6 +1700,8 @@ FLOAT:
 		HP: 17500
 	Mobile:
 		Locomotor: HoverInfantry
+	Hovers:
+		RequiresCondition: !WebDisable
 	Crushable:
 		WarnProbability: 0
 		CrushSound: squish6.aud
@@ -1733,10 +1735,14 @@ FLOAT:
 		Weapon: UnitDrownedSmall
 	ActorStatValues:
 		Damage: -40
-	-DamagedByTintedCells@Default:
-	-DamagedByTintedCells@BlueRadiation:
-	-DamagedByTintedCells@OrangeRadiation:
-	-DamagedByTintedCells@Colossus:
+	DamagedByTintedCells@Default:
+		RequiresCondition: WebDisable
+	DamagedByTintedCells@BlueRadiation:
+		RequiresCondition: WebDisable
+	DamagedByTintedCells@OrangeRadiation:
+		RequiresCondition: WebDisable
+	DamagedByTintedCells@Colossus:
+		RequiresCondition: WebDisable
 
 BUG:
 	Inherits: ^ScrinSoldier
@@ -2415,7 +2421,6 @@ GLAD:
 
 MOTH:
 	Inherits: ^HoverDroneSoldier
-	Inherits@TINTEDCELLS: ^DamagedByTintedCells
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@REGENMATERIALS: ^AffectedByRegenerativeMaterials
@@ -2490,13 +2495,13 @@ MOTH:
 		RequiresCondition: !undeployed && !inside-tunnel && !WebDisable
 	-WithInfantryBody:
 	DamagedByTintedCells@Default:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || WebDisable || empdisable
 	DamagedByTintedCells@BlueRadiation:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || WebDisable || empdisable
 	DamagedByTintedCells@OrangeRadiation:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || WebDisable || empdisable
 	DamagedByTintedCells@Colossus:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || WebDisable || empdisable
 	Armament@1:
 		Weapon: LurkerProj
 		PauseOnCondition: WebDisable || empdisable || !deployed
diff --git a/mods/sp/rules/vehicles.yaml b/mods/sp/rules/vehicles.yaml
index 54feb1e4d..bcb43ac38 100644
--- a/mods/sp/rules/vehicles.yaml
+++ b/mods/sp/rules/vehicles.yaml
@@ -3037,13 +3037,17 @@ LIMPED:
 		Name: deployed
 		RequiresCondition: show-deploybody && !inside-tunnel
 	DamagedByTintedCells@Default:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || empdisable
 	DamagedByTintedCells@BlueRadiation:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || empdisable
 	DamagedByTintedCells@OrangeRadiation:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || empdisable
 	DamagedByTintedCells@Colossus:
-		RequiresCondition: deployed
+		RequiresCondition: deployed || empdisable
+	-ChangesHealth@veinholedrain:
+	-ExternalCondition@veinholedrain:
+	-WithIdleOverlay@veinholedrain:
+	-GrantConditionOnTerrain@VEINS:
 	-LeavesTrails@land:
 	LeavesTrails@water:
 		Image: wake
@@ -3551,7 +3555,7 @@ SCRMBT:
 	-LeavesTrails@land:
 	-LeavesTrails@water:
 	LeavesTrails@gravity:
-		RequiresCondition: !inside-tunnel
+		RequiresCondition: !inside-tunnel && !empdisable
 		Image: wake
 		Sequences: idlescr
 		Palette: scrinenergystuffs
@@ -3639,7 +3643,7 @@ SCRGLYDER2:
 	-LeavesTrails@land:
 	-LeavesTrails@water:
 	LeavesTrails@gravity:
-		RequiresCondition: !inside-tunnel
+		RequiresCondition: !inside-tunnel && !empdisable
 		Image: wake
 		Sequences: idlescr
 		Palette: scrinenergystuffs
@@ -3840,7 +3844,7 @@ SCRMOBMINE:
 	-LeavesTrails@land:
 	-LeavesTrails@water:
 	LeavesTrails@gravity:
-		RequiresCondition: !inside-tunnel
+		RequiresCondition: !inside-tunnel && !empdisable
 		Image: wake
 		Sequences: idlescr
 		Palette: scrinenergystuffs