Merge remote-tracking branch 'origin/master'

locations/albina_school_sex.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'lunch_fun_1_2':
 	'Albina leans over into Julia''s face. "<<$pcs_nickname>> and I were just going to have a little fun is all. I know you would love to watch that."'
 	'Julia blushes and looks around for a way out as Albina smiles. "Don''t be shy, Julia. I know you love staring at my ass, and who can blame you? It''s so <i>big</i> and <i>firm</i> and you''d just love to feel it in your hands and give it a good squeeze, wouldn''t you?"'
 	'Julia blushes and squirms even more as she looks at the floor. "I, I... What are you... Talking about?"'
-	'"Don''t be like that, Julia! I''d like it, no <i>love</i> it, if you played with my ass right here, right now. '+iif func('pcs_has_attr', 'body_ass_bubble')(,'I bet you''d love to have a feel of <<$pcs_nickname>>''s big ass as well, wouldn''t you?','')+'"'
+	'"Don''t be like that, Julia! I''d like it, no <i>love</i> it, if you played with my ass right here, right now. '+iif(func('pcs_has_attr', 'body_ass_bubble'),'I bet you''d love to have a feel of <<$pcs_nickname>>''s big ass as well, wouldn''t you?','')+'"'
 	
 	act 'Continue':
 		*clr & cla

locations/katja_nightclub_sex.qsrc

@@ -1518,7 +1518,7 @@ if $ARGS[0] = 'private_booth_FFFF_you':
 						katjaQw['horny'] += rand(5,15)
 						gs 'boystat', 'D5', 'd'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private10.jpg"></center>'	
-						'<<$npc_nickname[$boy2]>> moves away, but Katja quickly moves in and starts kissing you. You hear <<$npc_nickname[$boy2]>> say "Here it is," before you feel something hard getting stuffed into your pussy. "It''s better if you do this yourself <<$psc_nickname>>," <<$npc_nickname[$boy1]>> says and you feel your right hand being moved to grasp what you imagine is a dildo in your pussy.'
+						'<<$npc_nickname[$boy2]>> moves away, but Katja quickly moves in and starts kissing you. You hear <<$npc_nickname[$boy2]>> say "Here it is," before you feel something hard getting stuffed into your pussy. "It''s better if you do this yourself <<$pcs_nickname>>," <<$npc_nickname[$boy1]>> says and you feel your right hand being moved to grasp what you imagine is a dildo in your pussy.'
 						'It takes a few tries to get into the rhythm of using the dildo, but you soon feel the nice sensation of having the dildos in your pussy and ass moving in and out of you, alternating which is deepest.'
 						*nl
 						'After a short while, you''re close to orgasm and rub your clit to bring you over.'
@@ -1572,7 +1572,7 @@ if $ARGS[0] = 'private_booth_FFFF_girls':
 	'<<$npc_nickname[$boy1]>> hands Katja a wand vibrator, which she quickly starts to use with glee on <<$npc_nickname[$boy2]>>.'
 	*nl
 	'<<$npc_nickname[$boy2]>> is clearly very excited and it don''t take you long to get her off. She cums with a huge yell, which makes you wonder if they can hear her on the dance floor.'
-	'After <<$npc_nickname[$boy2]>> get her breath back, she get up. "Okay whore, now it''s your turn so get down on all fours," she says to <<$npc_nickname[boy1]>>.'
+	'After <<$npc_nickname[$boy2]>> get her breath back, she get up. "Okay whore, now it''s your turn so get down on all fours," she says to <<$npc_nickname[$boy1]>>.'
 	act 'See what happens':
 		katjaQw['horny'] += rand(0,5)
 		gs 'arousal', 'vaginal_dildo_give', 4, 'group', 'lesbian'

locations/mitkasex.qsrc

@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'forestDogCum1_1':
 	gs 'arousal', 'vaginal', 5, 'sub', 'group'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish': gt 'mitkasex', 'end'g
+	act 'Finish': gt 'mitkasex', 'end'
 end
 
 if $ARGS[0] = 'forestDog1_2':

locations/pav_hotelReception.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = '':
 					end
 				end
 
-				act 'Step away from the reception desk': gt d'pav_hotel'
+				act 'Step away from the reception desk': gt 'pav_hotel'
 			end
 			act 'No, thank you': gt 'pav_hotel'
 		end

locations/pav_train_market.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = 'start':
 				if mc_inventory['tapestry'] > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						'You show Roman your tapestries, and he gives you <<mc_inventory['tapestry'] * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						'You show Roman your tapestries, and he gives you <<mc_inventory[''tapestry''] * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
 						money += mc_inventory['tapestry'] * 1000
 						mc_inventory['tapestry'] = 0
 						gs'stat'

locations/uni_dorm.qsrc

@@ -440,7 +440,7 @@ if $ARGS[0] = 'seventh_floor':
 						'Placing your ear to the door, you can hear a bed squeaking, accompanied by Albina''s loud moans and a boy grunting.'
 						'<b>"FUCK YES, JUST LIKE THAT! DON''T STOP, I''M GONNA FUCKING CUM!!"</b>'
 						'Seeing that you''re not going to get an answer anytime soon, you step away from the door.'
-						act 'Leave': minut += 1 2 gt 'uni_dorm', 'seventh_floor'
+						act 'Leave': minut += 1 & gt 'uni_dorm', 'seventh_floor'
 					else
 						'Placing your ear to the door, you can hear a faint gagging sound and the voice of a boy that you can''t quite place.'
 						'"Fuck, keep sucking my dick like that, I''m gonna cum!"'