Merge remote-tracking branch 'Sicaa/master'

# Conflicts:
#	locations/lesbimistress.qsrc

locations/bed2.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'wake_horny':
 	end
 
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
-		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep'
+		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep', 'sister_sleep'
 	elseif $loc = 'FedorEv4':
 		act 'Wake Fedor and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'
 		!!Intro text doesn''t quite fit event (but doesn''t quite fit - try for baby - scenario either) - custom scene from VK?

locations/bedrPar.qsrc

@@ -121,7 +121,7 @@ if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 gs'dinsister'
 
 act 'Exit the room':
-	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 :gt'sister','pargone'
+	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 : gt 'sister_chat', 'pargone'
 	gt'korrPar'
 end
 
@@ -130,7 +130,7 @@ if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
 else
 	gs'family'
 
-	if rexCarCount >= 9 and sisterHere = 1 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13: act 'Send Rex a SMS message':gt 'reks','sms'
+	if rexCarCount >= 9 and sisterHere = 1 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13: act 'Send Rex a SMS message': gt 'reks','sms'
 
 	if student > 0 and kursovik < 100:
 		act 'Do coursework (1:00)':

locations/family.qsrc

@@ -64,25 +64,25 @@ if StoryLine = 1:
 
 			if hour < 7:
 				sisterHere = 1
-				'Your sister <a href="exec:gt ''sistersleep''">Anya</a> is asleep in her bed.'
+				'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 			end
 
 			if week >= 6:
 				if hour >= 7 and hour < 10:
 					sisterHere = 1
-					'Your sister <a href="exec:gt ''sistersleep''">Anya</a> is asleep in her bed.'
+					'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 				end
 
 				if hour = 10:
 					sisterHere = 2
 					sisterdialog = 3
-					'Your sister <a href="exec:gt ''sister''">Anya</a> is getting ready to go for a walk.'
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go for a walk.'
 				end
 			end
 
 			if hour >= 18 and sisboyparty_day + 1 ! daystart:
 				sisterHere = 2
-				'Your sister <a href="exec:gt ''sister''">Anya</a> is sitting on her bed, reading a book.'
+				'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 			elseif sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
 				*clr & cla
 				menu_off = 1

locations/korrPar.qsrc

@@ -60,7 +60,7 @@ end
 
 if blockBedrPar = 0:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
-		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'
+		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom'
 	elseif sisboyday + 1 = daystart and hour = 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
 		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else

locations/kuhrPar.qsrc

@@ -30,7 +30,7 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 if hour = 7 and indorf = 0:
 	*nl '<a href="exec:gt''father''">Your stepfather</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating Breakfast. <a href="exec:gt''mother''">Your mother</a> is hard at work to make sure everybody has enough to eat for the rest of the day.'
-	if week <= 5: *P ' <a href="exec:gt''sister''">Anya</a> is trying to lose some weight so she is only having a very light breakfast.'
+	if week <= 5: *P ' <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is trying to lose some weight so she is only having a very light breakfast.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone has the habit of eating at different times, <<$npc_nickname[''A29'']>> usually pre-cooks the meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
 end

locations/lesbimistress.qsrc

@@ -1413,8 +1413,9 @@ if $ARGS[0] = 'treat_3':
 	'She grins threateningly: "Let''s make it interesting: you have fifteen minutes starting... now. If you bring me to orgasm in time, I will reward you. If you fail, I will punish you." Ah. There''s the catch.'
 	'You swallow nervously and drop to your knees behind her, focusing to lick her pussy where you know she''s the most sensitive. Of course you don''t forget about the rest, and slide your tongue over her tight, pristine anus every once in a while.'
 	'"Five minutes remaining, slave!" Mistress announces menacingly. You redouble your efforts, using every trick you know to try and get your Mistress off in time. Her cute sighs and moans tell you you''re definitely on the right way...'
-	
-	gs 'arousal', 'cuni_give', 20, 'sub', 'lesbian'
+
+	gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
+	gs 'arousal', 'cuni_give', 5, 'sub', 'lesbian'
 	gs 'stat'
 		
 	if rand(0,1) = 0: