Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

# Conflicts:
#	locations/saveupdater.qsrc

locations/journal.qsrc

@@ -1607,7 +1607,7 @@ if $ARGS[0] = 'uni':
 			elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 40:
 				'You you think you are prepared enough to pass your <<$class_list_name[j]>> exam. But if you want a good grade you need to do some seriuos studying.'
 			else
-				'If your <<$class_list_name[j]>> exam was today you would afil. So time to hit the books if you don''t want to fail your semester.'
+				'If your <<$class_list_name[j]>> exam was today you would fail. So time to hit the books if you don''t want to fail your semester.'
 			end
 		end
 		j += 1

locations/saveupdater.qsrc

@@ -593,6 +593,17 @@ end
 	mastrOnce = 0
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080001:
+	!!--------0.8.0.1---school social group adjustment
+	if gruptipe[9000] = 0:
+		gruptipe[9000] = 1
+		grupvalue[1] = grupvalue[1] * 10
+		grupvalue[2] = grupvalue[2] * 10
+		grupvalue[3] = grupvalue[3] * 10
+		grupvalue[4] = grupvalue[4] * 10
+	end
+	!!--------0.8.0.1---school social group adjustment
+end
 
 	!!--------0.8.1--- Music variable names changed
 	if ml_update_1 = 0:
@@ -1428,25 +1439,6 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 end
 
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080601:
-
-	!!--------0.8.0.1---school social group adjustment
-	if gruptipe[9000] = 0:
-		gruptipe[9000] = 1
-		grupvalue[1] = grupvalue[1] * 10
-		grupvalue[2] = grupvalue[2] * 10
-		grupvalue[3] = grupvalue[3] * 10
-		grupvalue[4] = grupvalue[4] * 10
-	end
-	!!--------0.8.0.1---school social group adjustment
-
-	if pcs_skin < 150: pcs_skin = 7 * pcs_skin
-	gs 'body'
-	gs 'body', 'DailyUpdate'
-	gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-	gs 'stat'
-end
-
 
 if mod_list > 0:
 	mod_i=1

locations/uni_programs.qsrc

@@ -226,14 +226,20 @@ if $ARGS[0] = 'uni_period_third':
 	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
-			if $ARGS[1] = 'monday' and $university['elective1'] ! '':
-				$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
-			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
-				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Learning Theories 101 (13:15 to 14:45)'
-			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
-				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday' :
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
 			elseif week = 1 and $university['elective1'] ! '': 
 				!!*nl
 				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -273,14 +279,20 @@ if $ARGS[0] = 'uni_period_third':
 				!!end
 			end
 		elseif university['enrolled_in_semester'] = 2:
-			if $ARGS[1] = 'monday' and $university['elective1'] ! '':
-				$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
-			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
-				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Phsychology of a Student 101 (13:15 to 14:45)'
-			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
-				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday':
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
 			elseif week = 1 and $university['elective1'] ! '': 
 				!!*nl
 				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'