Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/pavCommercial.qsrc

@@ -116,7 +116,7 @@ end
 if hour >= 8 and hour <= 20:
 	$desc_txt3 = '<a href="exec:minut += 2 & gt ''shop'', ''start''">Pyaterochka</a>, a popular discount supermarket chain'
 else
-	$desc_txt3 = '<a href="exec:msg ''Pyaterochka, which is closed right now. It will reopen again at 8:00''">Pyaterochka</a>'
+	$desc_txt3 = '<a href="exec:msg ''Pyaterochka, which is closed right now. It will reopen again at 8:00''">Pyaterochka</a>, a popular discount supermarket chain'
 end
 '<br>Of course, right after you visit the bank, you can spend your money at <<$desc_txt3>>.' 
 

locations/preCSB.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'intro_1_straight':
 	*clr & cla
 	csb_bisexual = 0
 	'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'
-	'You protest your innocence. It was just a drunken prank, nothing more. You manage to impress upon your uncle the truth, but he is still furious, more at the damage you are causing [i]his[/i] reputation than anything else. He gives you an ultimatum: undo the damage you have done by proving your masculinity.'
+	'You protest your innocence. It was just a drunken prank, nothing more. You manage to impress upon your uncle the truth, but he is still furious, more at the damage you are causing <i>his</i> reputation than anything else. He gives you an ultimatum: undo the damage you have done by proving your masculinity.'
 	'You have to convince a girl to have sex with you and post pictures by the end of the summer. If you fail, you will be disowned and have to fend for yourself.'
 	
 	act 'Continue': gt 'preCSB', 'intro_2_name'
@@ -67,7 +67,7 @@ if $ARGS[0] = 'intro_1_bi':
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'
-		'You somehow manage to deceive your uncle. Maybe he believes you, or maybe he just wants to, but he believes that it is only a drunken prank gone wrong. He is still furious, but it is more at the damage you are causing [i]his[/i] reputation than anything else.'
+		'You somehow manage to deceive your uncle. Maybe he believes you, or maybe he just wants to, but he believes that it is only a drunken prank gone wrong. He is still furious, but it is more at the damage you are causing <i>his</i> reputation than anything else.'
 		'He gives you an ultimatum: undo the damage you have done by proving your masculinity. You have to convince a girl to have sex with you and post pictures by the end of the summer. If you fail, you will be disowned and have to fend for yourself.' 
 
 		act 'Continue': gt 'preCSB', 'intro_2_name'
@@ -164,10 +164,12 @@ end
 
 if $ARGS[0] = 'intro_5':
 	*clr & cla
+	if $month = 'August': $cbpre_text1 = ' the end of'
 	'<center><img <<$set_imgh>> src="images/pre/csb/talkingcsb.jpg"></center>'
 	'A couple months pass. You and <<$pcs_nickname>> continue to talk, and you learn even more about her life, from her envy of the confidence of the gopnik Anushka to her secret crush on the athlete Fedor.'
-	'In a short while, <<$pcs_nickname>> develops a massive crush on you, as you are the only boy who has ever paid any attention to her. As [If starting in August, add line "the end of"] summer break approaches, you bring up the idea of meeting up. <<$pcs_nickname>> is excited at the prospect and you agree to meet at the café where her mother works.'
+	'In a short while, <<$pcs_nickname>> develops a massive crush on you, as you are the only boy who has ever paid any attention to her. As <<$cbpre_text1>>summer break approaches, you bring up the idea of meeting up. <<$pcs_nickname>> is excited at the prospect and you agree to meet at the café where her mother works.'
 
+	killvar '$cbpre_text1'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pre/csb/start6csb.jpg"></center>'