diff --git a/mods/sp/rules/defaults.yaml b/mods/sp/rules/defaults.yaml
index 23936de1d..9b5209d0e 100644
--- a/mods/sp/rules/defaults.yaml
+++ b/mods/sp/rules/defaults.yaml
@@ -2055,6 +2055,38 @@
 	ActorStatValues:
 		Stats: Armor, Sight, Speed, Damage, ReloadDelay, MaxRange
 
+^HoverDroneSoldier:
+	Inherits: ^DroneSoldier
+	Mobile:
+		Locomotor: HoverInfantry
+	KillsSelf@DisabledOnWater:
+		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
+	GrantConditionOnTerrain:
+		Condition: hoverunitonwater
+		TerrainTypes: Water
+	LeavesTrails:
+		RequiresCondition: hoverunitonwater
+		Image: wake
+		Palette: effect
+		TerrainTypes: Water
+		StationaryInterval: 18
+		MovingInterval: 12
+		Sequences: idle2
+	ExplodesAlsoTransported:
+		Weapon: DroneExplode
+		RequiresCondition: (!ascargo && !hoverunitonwater) || (!empdisable && !WebDisable)
+	ExplodesAlsoTransported@DisabledOnWater:
+		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
+		Weapon: UnitDrownedSmall
+	SpawnActorOnDeath@conversion:
+		RequiresCondition: !hoverunitonwater
+	SpawnActorOnDeath@conversionUpg:
+		RequiresCondition: !hoverunitonwater
+	-DamagedByTintedCells@Default:
+	-DamagedByTintedCells@BlueRadiation:
+	-DamagedByTintedCells@OrangeRadiation:
+	-DamagedByTintedCells@Colossus:
+
 ^CivilianInfantry:
 	Inherits: ^Infantry
 	Voiced:
@@ -2358,13 +2390,13 @@
 		SpawnAtLastPosition: false
 		TrailWhileStationary: true
 		StartDelay: -1
-	KillsSelf@hoverunitonwater:
-		RequiresCondition: hoverunitonwater && empdisable
 	GrantConditionOnTerrain:
 		Condition: hoverunitonwater
 		TerrainTypes: Water
 	ExplodesAlsoTransported:
 		RequiresCondition: !hoverunitonwater || !empdisable
+	KillsSelf@DisabledOnWater:
+		RequiresCondition: hoverunitonwater && empdisable
 	ExplodesAlsoTransported@DisabledOnWater:
 		RequiresCondition: hoverunitonwater && empdisable
 		Weapon: UnitDrowned
diff --git a/mods/sp/rules/infantry.yaml b/mods/sp/rules/infantry.yaml
index f09c5151b..7e2af4413 100644
--- a/mods/sp/rules/infantry.yaml
+++ b/mods/sp/rules/infantry.yaml
@@ -1723,7 +1723,7 @@ FLOAT:
 	AutoTarget:
 		ScanRadius: 7 #PREF: save trait looks up and scan armaments
 	-TakeCover:
-	KillsSelf@hoverunitonwater:
+	KillsSelf@DisabledOnWater:
 		RequiresCondition: hoverunitonwater && WebDisable
 	GrantConditionOnTerrain:
 		Condition: hoverunitonwater
@@ -2274,7 +2274,7 @@ SWARMLING:
 	-WithDeathAnimation@blood1:
 
 PDRONE:
-	Inherits: ^DroneSoldier
+	Inherits: ^HoverDroneSoldier
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@RECYCLE: ^AffectedByReclaimAndRecycle
@@ -2344,31 +2344,8 @@ PDRONE:
 			FireDeath: 1, 2
 			ExplosionDeath: 1,2
 			EnergyDeath: 1,2
-	KillsSelf@hoverunitonwater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-	GrantConditionOnTerrain:
-		Condition: hoverunitonwater
-		TerrainTypes: Water
-	LeavesTrails:
-		RequiresCondition: hoverunitonwater
-		Image: wake
-		Palette: effect
-		TerrainTypes: Water
-		StationaryInterval: 18
-		MovingInterval: 12
-		Sequences: idle2
 	ExplodesAlsoTransported:
 		Weapon: SimpleDroneExplode
-		RequiresCondition: (!ascargo && !hoverunitonwater) || (!empdisable && !WebDisable)
-	ExplodesAlsoTransported@DisabledOnWater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-		Weapon: UnitDrownedSmall
-	-SpawnActorOnDeath@conversion:
-	-SpawnActorOnDeath@conversionUpg:
-	-DamagedByTintedCells@Default:
-	-DamagedByTintedCells@BlueRadiation:
-	-DamagedByTintedCells@OrangeRadiation:
-	-DamagedByTintedCells@Colossus:
 	ActorStatValues:
 		Damage: 63
 		Upgrades: upgrade.reclaim_and_recycle, upgrade.regenerative_materials
@@ -2437,7 +2414,8 @@ GLAD:
 		Upgrades: upgrade.cybernetic_leg_enhancements, upgrade.regenerative_materials
 
 MOTH:
-	Inherits: ^DroneSoldier
+	Inherits: ^HoverDroneSoldier
+	Inherits@TINTEDCELLS: ^DamagedByTintedCells
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@REGENMATERIALS: ^AffectedByRegenerativeMaterials
@@ -2466,30 +2444,11 @@ MOTH:
 		RequiresCondition: !deployed && !WebDisable && !empdisable
 	Mobile:
 		Speed: 105
-		Locomotor: HoverInfantry
 		ImmovableCondition: !undeployed
 		PauseOnCondition: WebDisable || empdisable
 		RequireForceMoveCondition: !AImicroManage && !undeployed
 	Passenger:
 		RequireForceMoveCondition: !undeployed
-	LeavesTrails:
-		RequiresCondition: hoverunitonwater
-		Image: wake
-		Palette: effect
-		TerrainTypes: Water
-		StationaryInterval: 18
-		MovingInterval: 12
-		Sequences: idle2
-	KillsSelf@hoverunitonwater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-	GrantConditionOnTerrain:
-		Condition: hoverunitonwater
-		TerrainTypes: Water
-	ExplodesAlsoTransported:
-		RequiresCondition: (!ascargo && !hoverunitonwater) || (!empdisable && !WebDisable)
-	ExplodesAlsoTransported@DisabledOnWater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-		Weapon: UnitDrownedSmall
 	Health:
 		HP: 40000
 	Selectable:
@@ -2546,7 +2505,7 @@ MOTH:
 		Weapon: GLurkerProj
 		PauseOnCondition: WebDisable || empdisable
 	Armament@AIAimOnly:
-		RequiresCondition: AImicroManage && !deployed
+		RequiresCondition: AImicroManage && !deployed && !hoverunitonwater
 		Weapon: LurkerAimDummyWeapon
 		Name: AIAim
 		PauseOnCondition: WebDisable || empdisable
@@ -2824,7 +2783,7 @@ WORKERMECH:
 		Damage: 11
 
 NANOS:
-	Inherits: ^DroneSoldier
+	Inherits: ^HoverDroneSoldier
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Valued:
 		Cost: 100
@@ -2834,8 +2793,6 @@ NANOS:
 		HP: 7000
 	Mobile:
 		Speed: 60
-		Locomotor: HoverInfantry
-		PauseOnCondition: WebDisable
 	Hovers:
 	Voiced:
 		VoiceSet: Limpet
@@ -2865,17 +2822,8 @@ NANOS:
 	WithSpriteBody:
 		Sequence: idle
 		RequiresCondition: !inside-tunnel && !WebDisable
-	KillsSelf@hoverunitonwater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-	GrantConditionOnTerrain:
-		Condition: hoverunitonwater
-		TerrainTypes: Water
 	ExplodesAlsoTransported:
 		Weapon: NanoDroneExplode
-		RequiresCondition: (!ascargo && !hoverunitonwater) || (!empdisable && !WebDisable)
-	ExplodesAlsoTransported@DisabledOnWater:
-		RequiresCondition: hoverunitonwater && (WebDisable || empdisable)
-		Weapon: UnitDrownedSmall
 	-SpawnCorpseOnDeath@nanomachinereanimate:
 	-SpawnActorOnDeath@conversion:
 	-SpawnActorOnDeath@conversionUpg:
diff --git a/mods/sp/rules/vehicles.yaml b/mods/sp/rules/vehicles.yaml
index 9ed68956b..54feb1e4d 100644
--- a/mods/sp/rules/vehicles.yaml
+++ b/mods/sp/rules/vehicles.yaml
@@ -2475,6 +2475,7 @@ HVRTRUK3:
 	ExplodesForMaster:
 		Weapon: BombTruckExplo
 		EmptyWeapon: BombTruckExplo
+		RequiresCondition: !hoverunitonwater || !empdisable
 	## Only Enabled when as cargo
 	ExplodesAlsoTransported:
 		RequiresCondition: carried
@@ -3061,7 +3062,7 @@ LIMPED:
 		RequiresCondition: limpetaa
 	### AI Control: make limped drone wander randomly and deploy when find enemy
 	Armament@AIAimOnly:
-		RequiresCondition: AImicroManage && !deployed
+		RequiresCondition: AImicroManage && !deployed && !hoverunitonwater
 		Weapon: LimpedAimDummyWeapon
 		PauseOnCondition: empdisable
 		Name: AIAim