diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index e02de84e45..5be66fcadf 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -106,6 +106,7 @@ MEDIC:
 		Weapon: Heal
 	AttackMedic:
 		Cursor: ability
+		OutsideRangeCursor: ability
 	Passenger:
 		PipType: Blue
 	-AutoTarget:
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index faa1583d3b..6d9765ac45 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -15,7 +15,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground, C4
+		TargetTypes: Ground, C4, Repair
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -70,7 +70,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground, C4
+		TargetTypes: Ground, C4, Repair
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -176,7 +176,7 @@
 	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
-		TargetTypes: Ground, Water
+		TargetTypes: Ground, Water, Repair
 	HiddenUnderFog:
 	AttackMove:
 	GainsExperience:
@@ -206,7 +206,7 @@
 		Voice: GenericVoice
 	TargetableAircraft:
 		TargetTypes: Air
-		GroundedTargetTypes: Ground
+		GroundedTargetTypes: Ground, Repair
 	HiddenUnderFog:
 	AttackMove:
 	Guard:
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index 08b13bd9b1..c28c01c19e 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -303,6 +303,7 @@ MEDI:
 		Weapon: Heal
 	AttackMedic:
 		Cursor: heal
+		OutsideRangeCursor: heal
 	TakeCover:
 	-AutoTarget:
 	-RenderInfantry:
@@ -338,6 +339,7 @@ MECH:
 		Weapon: Repair
 	AttackMedic:
 		Cursor: repair
+		OutsideRangeCursor: repair
 	Captures:
 		CaptureTypes: husk
 	TakeCover:
diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml
index 19a699c4ba..982a533697 100644
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -22,8 +22,8 @@ SS:
 		Range: 6c0
 	-TargetableUnit:
 	TargetableSubmarine:
-		TargetTypes: Ground, Water
-		CloakedTargetTypes: Underwater
+		TargetTypes: Ground, Water, Repair
+		CloakedTargetTypes: Underwater, Repair
 	RenderUnit:
 	Cloak:
 		CloakTypes: Underwater
@@ -73,8 +73,8 @@ MSUB:
 	RenderUnit:
 	-TargetableUnit:
 	TargetableSubmarine:
-		TargetTypes: Ground, Water
-		CloakedTargetTypes: Underwater
+		TargetTypes: Ground, Water, Repair
+		CloakedTargetTypes: Underwater, Repair
 	Cloak:
 		CloakTypes: Underwater
 		InitialDelay: 0
diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml
index 02ba9a7c4e..e777f77745 100644
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -725,7 +725,7 @@ QTNK:
 	MadTank:
 	-EjectOnDeath:
 	TargetableUnit:
-		TargetTypes: Ground, MADTank
+		TargetTypes: Ground, MADTank, Repair
 
 STNK:
 	Inherits: ^Vehicle
diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml
index 29625e06b4..d0496da575 100644
--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml
@@ -953,6 +953,7 @@ Repair:
 	ROF: 80
 	Range: 4c0
 	Report: FIXIT1.AUD
+	ValidTargets: Repair
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead:
diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml
index b4eac175cc..5772a5694d 100644
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -268,6 +268,7 @@ REPAIR:
 		Weapon: Repair
 	AttackMedic:
 		Cursor: repair
+		OutsideRangeCursor: repair
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody: