diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index ea9b6f838e..bfe1196264 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -304,6 +304,7 @@ HUNTER:
 		EmptyWeapon: SuicideBomb
 	Aircraft:
 		RearmBuildings:
+		RepairBuildings:
 		ROT: 16
 		Speed: 355
 		CruiseAltitude: 256
diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index 879a3964c5..c559a543e3 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -375,6 +375,18 @@ GAPLUG:
 		InsufficientPowerSound:
 		DisplayRadarPing: True
 		CameraActor: camera
+	ProduceActorPower:
+		UpgradeTypes: plug.hunterseeker
+		UpgradeMinEnabledLevel: 1
+		Description: Hunter Seeker
+		LongDesc: Releases a drone that will acquire and destroy an enemy target.
+		Icon: hunterseeker
+		Actors: hunter
+		Type: HunterSeeker
+		ChargeTime: 720
+	Production:
+		Produces: HunterSeeker
+	Exit@1:
 	SupportPowerChargeBar:
 	Power:
 		Amount: -150
@@ -382,22 +394,36 @@ GAPLUG:
 		UpgradeTypes: plug.ioncannon
 		UpgradeMinEnabledLevel: 1
 		Amount: -100
+	Power@hunterseeker:
+		UpgradeTypes: plug.hunterseeker
+		UpgradeMinEnabledLevel: 1
+		Amount: -50
 	Pluggable@pluga:
 		Offset: 0,2
 		Upgrades:
 			plug.ioncannon: plug.ioncannon, plug.ioncannona
+			plug.hunterseeker: plug.hunterseeker, plug.hunterseekera
 	WithIdleOverlay@ioncannona:
 		UpgradeTypes: plug.ioncannona
 		UpgradeMinEnabledLevel: 1
 		Sequence: idle-ioncannona
+	WithIdleOverlay@hunterseekera:
+		UpgradeTypes: plug.hunterseekera
+		UpgradeMinEnabledLevel: 1
+		Sequence: idle-hunterseekera
 	Pluggable@plugb:
 		Offset: 1,2
 		Upgrades:
 			plug.ioncannon: plug.ioncannon, plug.ioncannonb
+			plug.hunterseeker: plug.hunterseeker, plug.hunterseekerb
 	WithIdleOverlay@ioncannonb:
 		UpgradeTypes: plug.ioncannonb
 		UpgradeMinEnabledLevel: 1
 		Sequence: idle-ioncannonb
+	WithIdleOverlay@hunterseekerb:
+		UpgradeTypes: plug.hunterseekerb
+		UpgradeMinEnabledLevel: 1
+		Sequence: idle-hunterseekerb
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 115,104,0,-24
diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml
index 5d1f9b1fe0..9bebf43ebc 100644
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -189,6 +189,22 @@ GAPOWRUP:
 	Power:
 		Amount: 50
 
+GAPLUG2:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: Seeker Control
+		Description: Enables use of the hunter-seeker droid.
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 1000
+		Prerequisites: gaplug, gatech, gaweap, ~structures.gdi
+	Plug:
+		Type: plug.hunterseeker
+	Power:
+		Amount: -50
+
 GAPLUG3:
 	Inherits: ^BuildingPlug
 	Valued:
diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml
index 7437004358..5d23c5cdba 100644
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -311,6 +311,16 @@ NATMPL:
 		Amount: -200
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
+	ProduceActorPower:
+		Description: Hunter Seeker
+		LongDesc: Releases a drone that will acquire and destroy an enemy target.
+		Icon: hunterseeker
+		Actors: hunter
+		Type: HunterSeeker
+		ChargeTime: 720
+	Production:
+		Produces: HunterSeeker
+	Exit@1:
 
 NASTLH:
 	Inherits: ^Building
diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 503d966cbe..b9877ce5c7 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -334,6 +334,7 @@ largecraters:
 icon:
 	clustermissile: mltiicon
 	ioncannon: ioncicon
+	hunterseeker: detnicon
 
 clustermissile:
 	up: null # TODO
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index 7f9e449028..4f6af930dd 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -1234,6 +1234,15 @@ gaplug:
 		Length: 15
 		Reverses: true
 		Tick: 120
+	idle-hunterseekera: gaplug_e
+		Length: 15
+		Tick: 120
+		Reverses: true
+		Offset: -12, -42
+	idle-hunterseekerb: gaplug_e
+		Length: 15
+		Reverses: true
+		Tick: 120
 	make: gtplugmk
 		Length: 17
 		ShadowStart: 17
@@ -1241,5 +1250,8 @@ gaplug:
 		Offset: 0, 0
 		UseTilesetCode: false
 
+gaplug2:
+	icon: rad2icon
+
 gaplug3:
 	icon: rad3icon
\ No newline at end of file