Merge branch 'master' into upstream-merge-36442

2018-04-01 19:50:37 -05:00
parent 6d117d18a3 28e188cbbe
commit f7be23e78a
132 changed files with 1560 additions and 536 deletions
@@ -104,7 +104,7 @@ Roboticist
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "research director"
+	supervisors = "the research director"
 	selection_color = "#ffeeff"
 	exp_requirements = 60
 	exp_type = EXP_TYPE_CREW