Make all aircraft repairable on GDI repair bay, make all armed aircraft rearmable on both helipads

mods/ts/rules/aircraft.yaml

@@ -74,7 +74,7 @@ ORCA:
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: gahpad
+		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 186
 	Health:
@@ -113,7 +113,6 @@ ORCAB:
 	Plane:
 		CruiseAltitude: 3072
 		MaximumPitch: 120
-		RearmBuildings: gahpad
 		ROT: 3
 		Speed: 96
 	Health:
@@ -208,7 +207,6 @@ SCRIN:
 		Voice: Scrin
 	Plane:
 		MaximumPitch: 90
-		RearmBuildings: nahpad
 		ROT: 3
 		Speed: 168
 	Health:
@@ -245,7 +243,7 @@ APACHE:
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: nahpad
+		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 130
 	Health:

mods/ts/rules/defaults.yaml

@@ -435,7 +435,7 @@
 	Selectable:
 		Voice: Heli
 	Helicopter:
-		RepairBuildings:
+		RepairBuildings: gadept
 		RearmBuildings:
 		LandWhenIdle: no
 		CruiseAltitude: 2048
@@ -475,7 +475,7 @@
 	Inherits: ^Helicopter
 	-Helicopter:
 	Plane:
-		RepairBuildings:
+		RepairBuildings: gadept
 		RearmBuildings: gahpad, nahpad
 		LandWhenIdle: no
 		CruiseAltitude: 2560