Merge branch 'endless-sky:master' into Zarkonnen-in-stock

wiki/CreatingMissions.md

@@ -720,7 +720,7 @@ There are eleven events that can trigger a response of some sort:
 * `accept`: if the player agrees to accept a mission.
 * `decline`: if the player decides to decline a mission.
 * `defer`: if the player decides to defer a mission.
-* `fail`: if the mission fails.
+* `fail`: if the mission fails. If the mission fails mid-flight, this only triggers on the next landing. Always triggers instantly when used in place of `on abort`.
 * `abort`: if the mission is aborted by the player. If no `on abort` action exists and the player aborts a mission, then any `on fail` action will be triggered instead.
 * `visit`: you land on the mission's destination, and it has not failed, but you have also not yet done whatever is needed for it to succeed.
 * `stopover`: you have landed on the last of the planets that are specified as a "stopover" point for this mission.

wiki/CreatingPlugins.md

@@ -49,8 +49,10 @@ Alongside the plugins folder in the config directory, Endless Sky will create a
 
 Linux:
 * ~/.local/share/endless-sky/errors.txt
+
 Windows:
 * %APPDATA%\endless-sky\errors.txt
+
 macOS:
 * ~/Library/Application Support/endless-sky/errors.txt
 

wiki/QualityChecklist.md

@@ -44,8 +44,9 @@ New missions:
 - [ ] Text should be as concise as possible. Remember this is a game, not a novel.
 - [ ] The "yes, I want this mission" choice in a conversation should usually come first in the list (so it is the default).
 - [ ] Conversations should not imply that the player is a certain gender or use gendered pronouns for the player (call them "kid" or "Captain" or `<first>` instead).
+- [ ] Single-option choices with no follow-up text should be avoided, since adding a choice right before the `[done]` button turns what should be a single input to close the conversation into two.
 
 New sounds:
 
 - [ ] Use a [Debian-compatible license](https://wiki.debian.org/DFSGLicenses).
-- [ ] Provide a copy of your raw working files used to create the sound, if possible.
+- [ ] Provide a copy of your raw working files used to create the sound, if possible.

wiki/StoryIdeas.md

@@ -13,7 +13,7 @@ The existing aliens are grouped roughly into tiers, where a heavy warship of a c
 * Tier 1: Humans
 * Tier 1.2: Hai
 * Tier 1.5: Coalition, Remnant, Korath Exiles and Efreti
-* Tier 1.9: Bunrodea
+* Tier 1.9: Bunrodea, Successors
 * Tier 2: Wanderers, Korath Automata, Ka'het
 * Tier 2.5: Heliarch
 * Tier 3: Quarg