Merge remote-tracking branch 'origin/development' into development

game/game.ink

@@ -1,6 +1,7 @@
 # author: Oreolek
 # title: chargen
 INCLUDE increments.ink
+INCLUDE pronouns.ink
 
 VAR ifid = "fill this pls"
 VAR background = "back.png"
@@ -88,7 +89,7 @@ Select your name.
 
 Select your Mystery Flavor.
 
-+ Egg -> step1
++ Egg -> step_pronouns
 + (Back) -> step_name
 
 === step1

game/pronouns.ink

@@ -12,7 +12,7 @@ CONST GEN_SHE = "she"
 CONST GEN_IT = "it"
 CONST GEN_THEY = "they"
 VAR pronoun = pronouns.he
-// Choose a random pronoun - useful when we're skipping the intro.
+// Choose a random pronoun - useful when we're skipping the choice.
 ~ pronoun = LIST_RANDOM(pronouns)
 
 === function me ===
@@ -32,22 +32,22 @@ VAR pronoun = pronouns.he
 }
 
 // You(), you(), Yours(), yours(), spnoun() and splural() are unused in English.
-=== choose_pronouns ===
+=== step_pronouns ===
 Choose your pronouns:
 
 * He/him
   ~ pronoun = pronouns.he
-  ->intro
+  ->step1
 * She/her
   ~ pronoun = pronouns.she
-  ->intro
+  ->step1
 * It/they
   ~ pronoun = pronouns.it
-  ->intro
+  ->step1
 * They/they (singular)
   ~ pronoun = pronouns.they_singular
-  ->intro
+  ->step1
 * They/they (plural)
   ~ pronoun = pronouns.they_plural
-  ->intro
+  ->step1