Merge branch 'master' of https://github.com/endless-sky/endless-sky

data/commodities.txt

@@ -563,7 +563,7 @@ trade
 		"thermoset polymer waste"
 		"trash"
 		"used syringes"
-		"volatile gasses"
+		"volatile gases"
 	commodity "Construction"
 		"box girders"
 		"carbon steel"

data/free worlds middle.txt

@@ -1359,7 +1359,7 @@ mission "FW Bloodsea 1.1"
 				goto attack
 			label attack
 			`	"So, we attack them?" you ask.`
-			`	"You're on council now," he says. "I'll leave it up to you. Option one is, we bring them the supplies and workers, in merchant ships, but use very heavily armed merchant ships in case they double cross us. Option two is, we go to Dancer and see if JJ can lend us an invasion fleet."`
+			`	"You're on the council now," he says. "I'll leave it up to you. Option one is, we bring them the supplies and workers, in merchant ships, but use very heavily armed merchant ships in case they double cross us. Option two is, we go to Dancer and see if JJ can lend us an invasion fleet."`
 				accept
 
 
@@ -1589,11 +1589,15 @@ mission "FW Albatross 1"
 			choice
 				`	"Okay, I feel silly for even asking. Let's go meet up with JJ!"`
 					accept
+				`	"Actually, I'm gay too."`
+					goto metoo
 				`	"Ah. That certainly explains a lot."`
 				`	"It seems crazy that anyone would be bothered by that in this day and age."`
 			`	"Yes," she says. "Yes, it does. Now, let's go meet up with JJ."`
 				accept
-
+			label metoo
+			`	Freya raises an eyebrow. "I hadn't heard. We don't have time to find someone else for this mission, so try not to say that so loudly when you're on Albatross."`
+				accept
 
 
 mission "FW Albatross 2"

data/hails.txt

@@ -3216,7 +3216,7 @@ phrase "hostile militia"
 
 phrase "hostile militia"
 	word
-		"The militia"
+		"The militia "
 		"We "
 	word
 		"live"

data/persons.txt

@@ -333,7 +333,7 @@ person "Captain Nate"
 		gun -31 -45 "Heavy Rocket Launcher"
 		gun 31 -45 "Heavy Rocket Launcher"
 		gun 31 -45 "Heavy Rocket Launcher"
-		turret 0 40 "Anti-Missile Turret"
+		turret 0 42 "Anti-Missile Turret"
 		explode "tiny explosion" 18
 		explode "small explosion" 36
 		explode "medium explosion" 24

data/tooltips.txt

@@ -114,10 +114,10 @@ tip "heat generation:"
 	`Heat generated by this outfit per second. Heat generation can be offset by "cooling" outfits. If your ship exceeds its maximum heat, it must temporarily shut down to cool itself off.`
 
 tip "hull repair / max:"
-	`Hull repair rate (per second) and total hull strength. Small ships are disabled when their hull strength drops below 50%; larger ships are disabled at 20%.`
+	`Hull repair rate (per second) and total hull strength. Small ships are disabled when their hull strength drops below 45%; larger ships are disabled at 15%.`
 
 tip "hull:"
-	`Total hull strength. Small ships are disabled when their hull strength drops below 50%; larger ships are disabled at 20%.`
+	`Total hull strength. Small ships are disabled when their hull strength drops below 45%; larger ships are disabled at 15%.`
 
 tip "hull energy:"
 	`Energy per second consumed when repairing the hull.`