Merge branch 'endless-sky:master' into experimental

copyright

@@ -1699,16 +1699,20 @@ Files:
  images/effect/*vi?flare*
  images/hardpoint/acuit*
  images/hardpoint/ballistic*
+ images/hardpoint/burrower*
  images/hardpoint/choleric*
  images/hardpoint/firestorm?battery*
+ images/hardpoint/ion?torch*
  images/hardpoint/irate*
  images/outfit/acuit*
+ images/outfit/acumen*
  images/outfit/ameliorate?cell*
  images/outfit/astuit*
  images/outfit/ballistic?cannon*
  images/outfit/ballistic?turret*
  images/outfit/battlezone?battery*
  images/outfit/brawl?cell*
+ images/outfit/burrower*
  images/outfit/campaign?core*
  images/outfit/choleric?cannon*
  images/outfit/choleric?turret*
@@ -1717,6 +1721,7 @@ Files:
  images/outfit/firestorm?rack*
  images/outfit/firestorm?torpedo*
  images/outfit/guile?pulse?laser*
+ images/outfit/ion?torch*
  images/outfit/irate?carronade*
  images/outfit/irate?cannon*
  images/outfit/irate?turret*
@@ -1734,6 +1739,7 @@ Files:
  images/outfit/warforge?battery*
  images/outfit/warzone?core*
  images/planet/asura*
+ images/planet/*beryl*
  images/planet/tschyss*
  images/planet/*vajra*
  images/planet/vesvi*
@@ -1748,25 +1754,31 @@ Files:
  images/projectile/irate*
  images/projectile/locust?blaster*
  images/projectile/mandible?cannon*
+ images/projectile/neutron?bolt*
  images/projectile/thorax?cannon*
+ images/projectile/torch*
  images/scene/rulei?flash*
  images/ship/*astral*
  images/ship/*ayym*
  images/ship/embersylph*
  images/ship/gegno?augen*
  images/ship/gegno?coesite*
  images/ship/gegno?conglomerate*
+ images/ship/gegno?corundum*
  images/ship/gegno?dolomite*
  images/ship/gegno?dunite*
  images/ship/gegno?eclogite*
  images/ship/gegno?epidote*
  images/ship/gegno?feldspar*
  images/ship/gegno?felsic*
  images/ship/gegno?gneiss*
+ images/ship/gegno?granofel*
  images/ship/gegno?granulite*
  images/ship/gegno?gypsum*
  images/ship/gegno?halite*
+ images/ship/gegno?kyanite*
  images/ship/gegno?mica*
+ images/ship/gegno?protolith*
  images/ship/gegno?schist*
  images/ship/gegno?shale*
  images/ship/gegno?slate*
@@ -1789,6 +1801,7 @@ Files:
  images/thumbnail/gegno?granulite*
  images/thumbnail/gegno?gypsum*
  images/thumbnail/gegno?halite*
+ images/thumbnail/gegno?kyanite*
  images/thumbnail/gegno?mica*
  images/thumbnail/gegno?schist*
  images/thumbnail/gegno?shale*
@@ -1854,6 +1867,7 @@ Files:
  sounds/human?launch*
  sounds/human?launch?external*
  sounds/ion?rain*
+ sounds/ion?torch*
  sounds/korath?afterburner*
  sounds/korath?launch*
  sounds/korath?launch?external*
@@ -1862,6 +1876,7 @@ Files:
  sounds/remnant?afterburner*
  sounds/remnant?launch*
  sounds/remnant?launch?external*
+ sounds/neutron?bolt*
  sounds/scin?launch*
  sounds/sheragi?launch*
  sounds/swarm?missile*

data/coalition/coalition missions.txt

@@ -959,6 +959,7 @@ mission "Saryd Students 2"
 	landing
 	deadline
 	cargo "arach rum" 2
+	blocked "You need <capacity> in order to take on the next mission. Return here when you have the required space free."
 	to offer
 		has "Saryd Students 1: done"
 	source "Weir of Glubatub"

data/gegno/gegno fleets.txt

@@ -11,6 +11,94 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
+fleet "Gegno Basic"
+	government Gegno
+	names "gegno scin"
+	cargo 2
+	personality
+		timid
+	variant 6
+		"Shale"
+	variant 3
+		"Dolomite"
+	variant 3
+		"Shale" 2
+	variant
+		"Shale" 3
+	variant
+		"Dolomite"
+		"Shale"
+	variant
+		"Dolomite" 2
+	variant
+		"Conglomerate"
+	variant
+		"Conglomerate"
+		"Shale"
+
+fleet "Gegno Miners"
+	government Gegno
+	names "gegno scin"
+	cargo 0
+	personality
+		pacifist timid plunders mining harvests ramming
+	variant 22
+		"Gypsum"
+	variant 6
+		"Corundum"
+	variant 5
+		"Corundum (Torch)"
+	variant
+		"Corundum (Multi)"
+	variant
+		"Gypsum"
+		"Granofel"
+	variant
+		"Corundum"
+		"Granofel"
+	variant
+		"Gypsum" 2
+	variant
+		"Corundum"
+		"Corundum (Torch)"
+
+fleet "Gegno Cargo"
+	government Gegno
+	names "gegno vi"
+	cargo 0
+	personality
+		timid
+	variant 8
+		"Dolomite" 2
+	variant 6
+		"Conglomerate"
+	variant 4
+		"Granofel"
+	variant 2
+		"Dolomite"
+		"Granofel"
+	variant 2
+		"Conglomerate"
+		"Dolomite"
+	variant 2
+		"Conglomerate"
+		"Granofel"
+	variant
+		"Granofel" 2
+		"Gypsum"
+	variant
+		"Granofel"
+		"Corundum"
+
+fleet "Gegno Old"
+	government Gegno
+	names "gegno vi"
+	cargo 2
+	personality
+		timid
+	variant
+		"Protolith"
+
 fleet "Small Vi"
 	government "Gegno Vi"
 	names "gegno vi"
@@ -235,7 +323,6 @@ fleet "Scin Transport"
 	variant
 		"Epidote"
 		"Halite"
-		"Coesite"
 	variant
 		"Tridymite"
 
@@ -245,46 +332,47 @@ fleet "Scin Cargo"
 	cargo 4
 	personality
 		timid
-	variant 4
+	variant 5
 		"Felsic"
-	variant 2
+	variant 3
 		"Felsic"
 		"Coesite"
-	variant
-		"Felsic" 2
-		"Mica"
 	variant 2
 		"Felsic"
 		"Mica"
 		"Coesite"
 	variant
-		"Epidote" 2
-		"Halite" 2
+		"Felsic" 2
+		"Mica"
+	variant
+		"Epidote"
+		"Halite"
 	variant
 		"Epidote"
 		"Halite"
+		"Coesite"
 
 fleet "Vi Warfleet"
 	government "Gegno Vi"
 	names "gegno vi"
 	cargo 0
 	personality
 		heroic vindictive opportunistic harvests
-	variant 5
+	variant 7
+		"Eclogite" 2
+	variant 4
 		"Hornfel"
 		"Eclogite" 2
-	variant 3
-		"Eclogite" 3
 	variant 2
 		"Hornfel"
 		"Hornfel (Light Load)"
 	variant
 		"Gneiss"
-		"Eclogite" 2
+		"Eclogite"
 	variant
 		"Gneiss"
 		"Eclogite"
-		"Hornfel (Heavy Load)" 2
+		"Hornfel (Heavy Load)"
 	variant
 		"Gneiss"
 		"Hornfel (Heavy Weapons)"
@@ -295,75 +383,56 @@ fleet "Scin Warfleet"
 	cargo 0
 	personality
 		vindictive opportunistic harvests
-	variant 5
+	variant 6
 		"Felsic"
 		"Coesite" 3
 	variant 4
-		"Felsic" 2
+		"Felsic"
 		"Coesite" 2
+	variant
+		"Felsic" 2
+		"Coesite"
 	variant
 		"Feldspar" 2
 		"Halite" 12
 	variant
 		"Feldspar"
 		"Halite" 6
-		"Coesite" 2
+		"Coesite"
 		"Felsic"
 	variant
 		"Feldspar"
 		"Halite" 6
 		"Coesite" 2
-	variant
-		"Felsic" 3
-
-fleet "Gegno Basic"
-	government Gegno
-	names "gegno scin"
-	cargo 2
-	personality
-		timid
-	variant 6
-		"Shale"
-	variant 3
-		"Dolomite"
-	variant 3
-		"Shale" 2
-	variant
-		"Shale" 3
-	variant
-		"Dolomite"
-		"Shale"
-	variant
-		"Dolomite" 2
-	variant
-		"Conglomerate"
-	variant
-		"Conglomerate"
-		"Shale"
-
-fleet "Gegno Miners"
-	government Gegno
-	names "gegno scin"
-	cargo 0
-	personality
-		pacifist timid plunders frugal mining harvests
-	variant 14
-		"Gypsum"
-	variant
-		"Gypsum" 2
 
 fleet "Gegno Vi Duelist A"
 	government "Gegno Vi (Duelist A)"
 	names "gegno vi"
 	personality
-		heroic unconstrained
+		heroic unconstrained ramming
 	variant
 		"Dunite"
 
 fleet "Gegno Vi Duelist B"
 	government "Gegno Vi (Duelist B)"
 	names "gegno vi"
 	personality
-		heroic unconstrained
+		heroic unconstrained ramming
 	variant
 		"Dunite"
+
+fleet "Scin Science"
+	government "Gegno Scin"
+	names "gegno scin"
+	cargo 4
+	personality
+		mining harvests
+	variant
+		"Kyanite"
+		"Tridymite"
+	variant
+		"Kyanite (Guile)"
+		"Tridymite"
+	variant
+		"Kyanite (Acumen)"
+		"Tridymite"