Merge branch 'endless-sky:master' into experimental

data/_ui/tooltips.txt

@@ -118,10 +118,10 @@ tip "cargo space needed:"
 	`Tons of cargo space this outfit uses up.`
 
 tip "cloak:"
-	`This outfit allows your ship to cloak. The value represents how long it takes to fully activate or deactivate cloaking. Ships cannot fire while cloaked, except if they have the related "cloaked action" attribute.`
+	`This outfit allows your ship to cloak. The value represents how long it takes to fully activate or deactivate cloaking. Ships cannot fire while cloaked, except if they have the related "cloaked firing" attribute.`
 
 tip "cloak by mass:"
-	`This outfit allows your ship to cloak. The value represents how long it takes to fully activate or deactivate cloaking. Ships of mass above 1000 will cloak slower, and below will cloak faster. Ships cannot fire while cloaked, except if they have the related "cloaked action" attribute.`
+	`This outfit allows your ship to cloak. The value represents how long it takes to fully activate or deactivate cloaking for a ship with 1000 mass. The higher a ships mass, the slower the cloak works, the lower its mass, the faster the cloak works. Ships cannot fire while cloaked, except if they have the related "cloaked firing" attribute.`
 
 tip "cloaking energy:"
 	`Energy consumed per second when cloaked.`

data/human/free worlds war jobs.txt

@@ -60,6 +60,7 @@ mission "FW Scout Run [0]"
 	waypoint
 		distance 1 2
 		government "Republic"
+		not system "Graffias"
 	on visit
 		dialog phrase "generic waypoint on visit"
 	on complete
@@ -85,9 +86,11 @@ mission "FW Scout Run [1]"
 	waypoint
 		distance 2 3
 		government "Republic"
+		not system "Graffias"
 	waypoint
 		distance 2 3
 		government "Republic"
+		not system "Graffias"
 	on visit
 		dialog phrase "generic waypoint on visit"
 	on complete
@@ -113,9 +116,11 @@ mission "FW Scout Run [2]"
 	waypoint
 		distance 2 3
 		government "Republic"
+		not system "Graffias"
 	waypoint
 		distance 3 4
 		government "Republic"
+		not system "Graffias"
 	on visit
 		dialog phrase "generic waypoint on visit"
 	on complete

data/human/human missions.txt

@@ -6773,10 +6773,10 @@ mission "Hogshead's Dilemma II"
 mission "Lost Dog"
 	name "Lost dog to <planet>"
 	description "Bring Caesar, a dog you found on <origin>, to their owners on <destination>."
-	to offer
-		random < 15
 	source "Calda"
 	destination "Glory"
+	to offer
+		random < 15
 	on offer
 		conversation
 			`Your walk from the <ship> takes you out of <planet>'s bustling spaceport and into the overtly welcoming and carefully inoffensive streets of the spaceport town. Each path seems to be saturated with tourists and purpose-built to whisk travelers further away from their ships and deeper into the preternatural radiance of this Paradise World. The hand-crafted beauty is inescapable, a never-ending sequence of breathtaking views.`
@@ -6883,10 +6883,12 @@ event "lost dog: homeward bound"
 
 
 mission "Lost Dog: Homeward Bound"
-	to offer
-		has "event: lost dog: homeward bound"
+	minor
+	invisible
 	source
 		government "Republic" "Free Worlds" "Syndicate" "Neutral" "Independent"
+	to offer
+		has "event: lost dog: homeward bound"
 	on offer
 		conversation
 			`As you're walking through the spaceport, your eye is drawn to a marginally familiar figure on a nearby newsfeed. Although you can't make out exactly what it is saying over the din, you are able to gather that Caesar, the little lost dog you ran into on Calda, has become something of a minor celebrity after it managed to get back home to Glory all by itself. The newsfeed scrolls down to show images of the dog skiing, sneaking onto transports, and riding automatic farming equipment.`