Merge remote-tracking branch 'origin/master'

locations/intro_sg_select_custom.qsrc

@@ -20,7 +20,26 @@ if $ARGS[0] = 'start':
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 			gs 'obj_din', 'old'
 		end
-		!!Set teh greades to be average.
+
+		killvar 'class_list_institution'
+		killvar 'class_list_name'
+
+		!!Setting the shcoll classes such that grades can be assigned
+		gs 'grades', 'createclass', 'school', 'math', 3, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'rus', 3, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'lit', 2, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'art', 2, 2, 'yes', 'no', 0, 0
+		gs 'grades', 'createclass', 'school', 'bio', 2, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'pe', 3, 1, 'yes', 'no', 0, 0
+		gs 'grades', 'createclass', 'school', 'eng', 2, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'geo', 2, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'sci', 2, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'shop', 2, 2, 'yes', 'no', 0, 0
+		gs 'grades', 'createclass', 'school', 'comp', 3, 2, 'yes', 'yes', 0, 0
+		gs 'grades', 'createclass', 'school', 'mus', 2, 2, 'yes', 'no', 0, 0
+		gs 'grades', 'createclass', 'school', 'his', 2, 2, 'yes', 'yes', 0, 0
+
+		!!Set the greades to be average.
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 55
 		gs 'grades', 'grade_award', 'school', 'lit', 55

locations/intro_sg_tg.qsrc

@@ -84,7 +84,7 @@ end
 if $ARGS[0] = 'intro_3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/17.jpg"></center>'
-	'Her name was <<$pcs_firstname>> <<$pcs_lastname>>, "<<$pcs_nickname>> for short. You don''t know why, but she seemed to liked you. Maybe she was as lonely as you were. You couldn''t believe your luck.'
+	'Her name was <<$pcs_firstname>> <<$pcs_lastname>>, <<$pcs_nickname>> for short. You don''t know why, but she seemed to liked you. Maybe she was as lonely as you were. You couldn''t believe your luck.'
 	'You spent the next few weeks messaging back and forth. <<$pcs_nickname>> told you all about her life, as well as her likes and dislikes.'
 
 	act 'Continue': gt 'intro_sg_tg', 'intro_4'
@@ -250,6 +250,9 @@ if $ARGS[0] = 'settings':
 	pcs_humint = 20
 	pcs_observ = 20
 
+	killvar 'class_list_institution'
+	killvar 'class_list_name'
+
 	!!Setting the shcoll classes such that grades can be assigned
 	gs 'grades', 'createclass', 'school', 'math', 3, 2, 'yes', 'yes', 0, 0
 	gs 'grades', 'createclass', 'school', 'rus', 3, 2, 'yes', 'yes', 0, 0