Merge branch 'patch-7' into 'pregmod-master'

Minor bugfix $arcologies[0].degradationist -> $arcologies[0].FSDegradationist

See merge request !1320

src/uncategorized/personalAssistantAppearance.tw

@@ -954,7 +954,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
   <</if>>
 
 <<case "angel">>
-	She's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> angel with long blonde hair and large <<if $arcologies[0].degradationist != "unset">>black<<else>>white<</if>> wings as large as her when they are folded.
+	She's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> angel with long blonde hair and large <<if $arcologies[0].FSDegradationist != "unset">>black<<else>>white<</if>> wings as large as her when they are folded.
 	<<if $assistantFSOptions>>
 	<<switch $assistantFSAppearance>>
 	<<case "paternalist">>