Merge remote-tracking branch 'hornguy6/master'

locations/_face_image.qsrc

@@ -2,7 +2,7 @@
 
 !!use with - <img <<$set_imgh>> src="<<FUNC(''$face_image'')>>">
 
-if player_avatar = 1:$RESULT = 'images/system/avatar.jpg' & exit
+if player_avatar = 1:$RESULT = 'images/avatar.jpg' & exit
 
 !! These images are missing from my copy of the image folder, so I am commenting them out for now
 !!if glass = 2:

locations/begin.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'description_real_character':
 	if birthday = 0: birthday = 1
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	*nl
 	'<center>On this screen, you may adjust your character''s description to match your avatar. Please note, at present, hair color and glasses choice may be overridden by the personality choice you make during the game intro.</center>'
 	*nl
@@ -154,7 +154,7 @@ end
 if $ARGS[0] = 'hair':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	*nl
 	if pcs_hairlng <= 1:
 		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''begin'', ''hair''">very short</a>,'
@@ -215,14 +215,14 @@ end
 if $ARGS[0] = 'lip':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	*nl
 	if pcs_lip = 0:$pcs_lip = 'you have thin<<$pcs_lipbalm>> lips.' & $liptalk = 'thin lips' & $liptalk2 = 'thin lips' & $liptalk3 = 'thin lips'
 	if pcs_lip = 1:$pcs_lip = 'You have normal<<$pcs_lipbalm>> lips.' & $liptalk = 'soft lips' & $liptalk2 = 'delicate lips' & $liptalk3 = 'tender lips'
 	if pcs_lip = 2:$pcs_lip = 'You have plump<<$pcs_lipbalm>> lips.' & $liptalk = 'plump lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'plump lips'
 	if pcs_lip = 3:$pcs_lip = 'You have large,<<$pcs_lipbalm>> full lips.' & $liptalk = 'full lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'full lips'
 	if pcs_lip = 4:$pcs_lip = 'You have huge, thick<<$pcs_lipbalm>> lips.' & $liptalk = 'thick lips' & $liptalk2 = 'thick lips' & $liptalk3 = 'thick lips'
-	'<center>Adjust the size of your lips to match your <a href="exec:view''images/system/avatar.jpg''">image</a>:</center>'
+	'<center>Adjust the size of your lips to match your <a href="exec:view''images/avatar.jpg''">image</a>:</center>'
 	*nl
 	'<center><i><<$pcs_lip>></i></center>'
 	*nl
@@ -235,7 +235,7 @@ if $ARGS[0] = 'eyes':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
 	if player_avatar = 1:
-		'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
@@ -292,7 +292,7 @@ if $ARGS[0] = 'birthday':
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
 	if csb_start ! 1:
 		if player_avatar = 1:
-			'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+			'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		end

locations/foto.qsrc

@@ -1158,7 +1158,7 @@ if $ARGS[0] = 'makeup':
 			*clr & cla
 			menu_off = 1
 			if player_avatar = 1:
-				'<center><img <<$set_imgh>> src="images/system/avatar.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
 			else
 				'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 			end

locations/gschool_groups.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'fuckornot':
 				fu_count += 1
 				hotcat_rating_set = 1
 				if player_avatar = 1:
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/system/avatar.jpg"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
+					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/avatar.jpg"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
 				else
 					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="<<FUNC(''$face_image'')>>"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
 				end

locations/mirror.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	$mirrorloc = 'mirror'
 	gs 'stat' &! It should be here, because some of the strigs have to be initialized
 	if player_avatar = 1:
-		'<center><img <<$set_imgh>> src="images/system/avatar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
@@ -430,7 +430,7 @@ if $ARGS[0] = 'brush':
 	minut += 3
 	pcs_hairbsh = 1
 	if player_avatar = 1:
-		'<center><img <<$set_imgh>> src="images/system/avatar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end

locations/preCSB.qsrc

@@ -158,7 +158,7 @@ end
 if $ARGS[0] = 'intro_6_looks':
 	*clr & cla
 	if player_avatar = 1:
-		'<center><img HEIGHT = 478 src="images/system/avatar.jpg"></center>'
+		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 		'She looks exactly like in the picture she sent you.'
 		act 'Meet her': gt 'preCSB', 'intro_7'
 	else