Merge remote-tracking branch 'Gwen/master'

locations/preCSB.qsrc

@@ -71,8 +71,8 @@ end
 
 if $ARGS[0] = 'intro_3':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/2.jpg"></center>'
-	'Her name is <<$pcs_firstname>> "<<$pcs_nickname>>" <<$pcs_lastname>>. She was born on the same day as you. You don''t know why she seems to like you, maybe she doesn''t have many friends either. You can''t believe your luck; this might be your saving grace.'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/17.jpg"></center>'
+	'Her name is <<$pcs_firstname>> "<<$pcs_nickname>>" <<$pcs_lastname>>. She was born on the same day as you. You don''t know why but she seems to like you, maybe she doesn''t have many friends either. You can''t believe your luck; this might be your saving grace.'
 	'You spend the next few weeks messaging back and forth. <<$pcs_nickname>> tells you all about her life as well as her likes and dislikes.'
 
 	act 'Continue': gt 'preCSB', 'intro_4'
@@ -104,7 +104,7 @@ end
 
 if $ARGS[0] = 'intro_4':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'You find out about her mother Natasha, and how her biological father left when she was a baby. Her mother remarried shortly afterwards to a man called Vladimir.'
 	'She has a sister named Anya who is a year older than her. Anya chose to live at home instead of going to college, working at the local grocery in the day and partying at night.'
 	'<<$pcs_nickname>> has a half-brother Kolka, who is a year younger than her and really into football.'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'intro_7':
 
 						act 'Keep going':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_altar.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_altar.jpg"></center>'
 							'At the end of the tunnel you find a dead end. Or at least it seems so. <<$pcs_nickname>> notices light coming through the cracks in the wall. You do your best to knock it down.'
 							'After a few good hits the wall crumbles and you find yourself in another chamber filled with old pottery and baubles. Opposite you is another tunnel, that hopefully leads out. In the center of the room is an altar and on it is what seems to be the centerpiece of this room, a strange amulet.'
 

locations/preNT.qsrc

@@ -479,7 +479,7 @@ if $ARGS[0] =  'Train':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/system/1_openings/5_nit/start_nit.jpg"></center>'
-						'Welcome to the New in Town version! You are finally free of your mother and ready to face all the freedoms and challenges that entails. Your options are nearly unlimited and now it''s time to go out and discover them all.'
+						'Welcome to the New in Town start! You are finally free of your mother and ready to face all the freedoms and challenges that entails. Your options are nearly unlimited and now it''s time to go out and discover them all.'
 						act 'Begin': gt 'korr'
 					end
 				end

locations/preTG.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'roadPRE':
 	'You leave the office and from your car phone your wife Luda. You explain the situation to her and as soon as you finish the call, you drive off to the construction site.'
 	act 'Drive':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/system/1_tf/shared/site_working.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_working.jpg"></center>'
 		'You''ve been on the highway for hours before you arrive at the town near the site, leaving you feeling tired. But before you can check into a hotel and get some sleep, you need to get an understanding of the magnitude of the problem you''re dealing with. You follow the directions to the site. Igor calls on the way and tells you that you won''t have to go through a security check.'
 		*nl
 		'You arrive and park your car at the site. You see Igor waving at you from a distance and you walk up to him.'
@@ -340,7 +340,7 @@ if $ARGS[0] = 'tatianaPRE':
 			'"Hence such things as little green men, UFOs, poltergeists, spontaneous combustion, are when people encounter a difficult to hide phenomenon and the conclusion is flawed. In some cases, if someone''s mind can not cope with the spell they witness, they can be driven crazy and then no one believes them."'
 			act 'And who are you?':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatianae.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 				'"And who are you?" you ask.'
 				*nl
 				'The girl smiled. "Me? I''m Tatiana, a young mage with an keen interest in magical phenomenon. I specialize in the treatment of mutations, and magic relating to the body. I have little combat skill, so I rely on the services of Gustav to provide some muscle. He''s a Mutant, his mutation is due to magical exposure and it gives him unmatched physical strength and he is a great tracker."'
@@ -492,7 +492,7 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/start_tf.jpg"></center>'
-					'Welcome to the Transgender version! You may have lost your masculinity and your old life, but numerous new possibilities are opening up before you, not least aided in your newfound knowledge of the magical nature of the world!'
+					'Welcome to the Transformation start! Although you have lost your masculinity and your old life, but new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world!'
 					act 'Begin': gt 'city_residential'
 				end
 			end

locations/underwear.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'dresser':
 	*nl
 	*nl
 
-	*p '<center><a href="exec:gt ''bras'', ''view_bra_list'', ''clean'', 6"><img src="images/system/icons/bra.png"></a>                               <a href="exec:gt ''panties'', ''view_panty_list'', ''clean'', 6"><img src="images/system/icons/panties.png"></a></center>'
+	*p '<center><a href="exec:gt ''bras'', ''view_bra_list'', ''clean'', 6"><img src="images/system/icons/status/bra.png"></a>                               <a href="exec:gt ''panties'', ''view_panty_list'', ''clean'', 6"><img src="images/system/icons/status/panties.png"></a></center>'
 
 	dynamic $wearpan
 	dynamic $removepan