Merge remote-tracking branch 'upstream/master'

locations/Katja_Tanga.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'secretroom':
 						act'Use dildo':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_7.jpg"></center>'
-							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you. As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
+							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you. As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
 							$orgasm_txt = 'You can''t take it and quickly orgasm. Your pussy overflows with your juices and you feel them running down your stomach as the intense orgasm rocks your body.'
 							$orgasm_or = 'custom'
 							gs 'arousal', 'anal_finger', -5, 'lesbian'

locations/LariskaSex.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'lick1':
 	'You start by running your fingers along her outer lips, making her shudder and pant, before laying on your back and pulling her onto your face. You attack her pussy with your tongue, drawing circles around her clitoris, but carefully not touching it.'
 	'She starts grinding into your face as you start fucking her with your tongue, begging for you to keep going. She grabs your head with one hand and reaches behind her to grab one of your tits to keep herself stable, but the pleasure is too much for her to sit still for long.'
 	'As her juices begin to coat your face, you stop licking and just keep your tongue out, letting her decide her own pace. She humps your tongue in glee, loving it, as you reach between your own legs and start rubbing your wet pussy.'
-	'You decide to step it up and and start licking her clit directly, before closing your lips around it and gently sucking. This sends her into a frenzy, moaning her way into pure bliss. As the orgasm breaks over her, her hips begin to jerk, her back arches, and her head swings around wildly.'
+	'You decide to step it up and start licking her clit directly, before closing your lips around it and gently sucking. This sends her into a frenzy, moaning her way into pure bliss. As the orgasm breaks over her, her hips begin to jerk, her back arches, and her head swings around wildly.'
 	$orgasm_txt = 'You are so aroused by the sight of Lariska riding your tongue that your fingers manage to trigger a massive orgasm. Your hips start bucking, and your feet flail in the air, as you try and keep yourself focused enough to continue eating Lariska out.'
 	$orgasm_or = 'custom'
 	gs 'arousal', 'clit_finger', -5, 'lesbian'

locations/agentned.qsrc

@@ -346,8 +346,8 @@ if $ARGS[0] = 'get_rent_detail_dialogue':
 		$result = '"We have a flat available right now in the St. Petersburg residential area."'
 	else
 		gs 'agentned', 'get_rent_detail_dialogue_hook', $ARGS[1]
-		$result = agency_rental_dialogue
-		killvar 'agency_rental_dialogue'
+		$result = $agency_rental_dialogue
+		killvar '$agency_rental_dialogue'
 	end 
 end
 

locations/albina_house_events.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'after_swim_shower':
 					act 'Enter':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
-						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
+						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
 						act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
 					end
 				end

locations/artem_sex.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'cum_surprise':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure, you glance down at his face and see him tense up before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him, and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. As a stream of his sperm hits you, you keep jerking him off. Then, causing several more streams of cum to land on your face, you stop jerking him off and open your eyes once the last of his cum has been drained.'
-		act 'Continue': gs 'artem_events', 'after_sex', 'facial'
+		act 'Continue': gs 'artem_sex', 'after_sex', 'facial'
 	end
 end
 

locations/audition_sex1.qsrc

@@ -43,7 +43,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

locations/audition_sex2.qsrc

@@ -48,7 +48,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

locations/audition_sex3.qsrc

@@ -44,7 +44,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

locations/cardgame_durak.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 				gs 'willpower', 'misc', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'shulga_room', 'start'
+				gt 'vasilyhome', 'livingroom'
 			end
 		else
 			act 'Not now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/city_clinic.qsrc

@@ -1566,7 +1566,7 @@ end
 
 if $ARGS[0] = 'milk_reception':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milk_reception.jpg"></center>'
-	'The woman at the reception looks at you annoyed and and stands up.'
+	'The woman at the reception looks at you annoyed and stands up.'
 	'Nurse at the reception: Yes, yes... go this way.'
 	'She waves into a general direction down the hallway.'
 	'Nurse at the reception: There should be a sign on the door, it is only a small room.'

locations/city_lake.qsrc

@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'vlake1':
 	act 'Flirt with them':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake2.jpg"></center>'
-		'The men sit next to you and and start flirting with you while trying to sneak a touch of your body.'
+		'The men sit next to you and start flirting with you while trying to sneak a touch of your body.'
 
 		gs 'willpower', 'misc', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:

locations/dreams.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'hypno_dreams':
 	if guy = 0:
 		'You wake up feeling strange and excited, even though you have never had sex the dream felt very real.'
 	elseif pcs_vag > 0 and stat['vaginal'] = 0:
-		'You have never had a cock in your pussy and and yet the sensations from the dream felt very real and have gotten you a little excited.'
+		'You have never had a cock in your pussy and yet the sensations from the dream felt very real and have gotten you a little excited.'
 	elseif stat['vaginal'] > 0 or pcs_vag > 0:
 		'It seems your <<$vaginatipe>> pussy urgently needs some attention.'
 	end

locations/gopsex.qsrc

@@ -218,7 +218,7 @@ if $ARGS[0] = 'gopsex_select':
 			gs 'willpower', 'sex', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -258,7 +258,7 @@ if $ARGS[0] = 'shgopsex':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -515,7 +515,7 @@ if $ARGS[0] = 'shgopsex_group':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/gschool_cheerleading.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'practice':
 					'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
 				end
 			else
-				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
+				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
 			end
 		end
 
@@ -457,7 +457,7 @@ if $ARGS[0] = 'game':
 	if pregtime >= 90:
 		gt 'gschool_cheerleading', 'Cheerleadersreact'
 	else
-		'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their uniforms while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed.'+iif(cheerleadingQW['backup_game'] = 1,' The fact that you are actually wearing the uniform and are going out to perform with them doesn''t seem real to you, even if the girls have only reluctantly let you join them.','')+' You finish tying your shoes when Albina stands on the bench. "You already know that today is game day! So let''s go out there and cheer our boys to victory!"'
+		'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their uniforms while chatting to each other. You head to your locker and strip down. You pull your uniform out and start getting dressed.'+iif(cheerleadingQW['backup_game'] = 1,' The fact that you are actually wearing the uniform and are going out to perform with them doesn''t seem real to you, even if the girls have only reluctantly let you join them.','')+' You finish tying your shoes when Albina stands on the bench. "You already know that today is game day! So let''s go out there and cheer our boys to victory!"'
 		'The squad cheers in unison as you all head out onto the field.'
 
 		act 'Go to the field':

locations/gschool_jock_chats.qsrc

@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'ivan':
 	elseif fame['pav_slut'] >= 225:
 		if npc_rel['A3'] >= 50:
 			'You see Ivan standing by the lockers and approach him. You cover his eyes from behind with your hands and whisper in his ear. "Guess who?"'
-			'Ivan grabs your hands, pulls free and and turns around. "Judging by the mixture of your perfume and the shame I can smell in the air, who else could it be but the school''s resident minx?" he jokingly replies.'
+			'Ivan grabs your hands, pulls free and turns around. "Judging by the mixture of your perfume and the shame I can smell in the air, who else could it be but the school''s resident minx?" he jokingly replies.'
 			'"Come on, since when are you interested in gossip?" you reply, twirling a lock of hair with your finger and then running your eyes over Ivan''s body. "Besides, a little flirting never hurts, right?" you ask playfully.'
 			*nl
 			'"You sure know how to play this game, I''ll give you that," he replies. You flirt back and forth with each other for the next few minutes. The air between you is almost glowing. "By the way, if you ever decide you want to train your ass, let me know. I can help you with that." Ivan winks.'

locations/gschool_sex.qsrc

@@ -1282,7 +1282,7 @@ if $ARGS[0] = 'femdom_petka_doggy':
 				act 'Let him cum on you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/peggingfacial.jpg"></center>'
-					'You pull your dildo out of his ass and and squat down next to the bench. "Stand up." you tell him. He does as you ask and stands up. You take his dick in your hand and start jerking him off. It doesn''t take long until he starts cumming, his cum splattering all over your chin and breasts. He just keeps cumming, more than you have ever seen anyone cum. Once he finally stops, he has coated you pretty well. You let go of him and stand up.'
+					'You pull your dildo out of his ass and squat down next to the bench. "Stand up." you tell him. He does as you ask and stands up. You take his dick in your hand and start jerking him off. It doesn''t take long until he starts cumming, his cum splattering all over your chin and breasts. He just keeps cumming, more than you have ever seen anyone cum. Once he finally stops, he has coated you pretty well. You let go of him and stand up.'
 					gs 'arousal', 'foreplay', 5, 'dom'
 					gs 'cum_call', 'face', 'A6'
 					gs 'cum_call', 'breasts', 'A6'
@@ -1671,7 +1671,7 @@ if $ARGS[0] = 'victor_lockerroom_cum':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
 	'He grabs you by the hair with one hand while he jerks off with the other. It doesn''t take long before he starts moaning loudly and hot sperm comes streaming out. Most of it lands on your face, but a little ends up in your open mouth. He keeps stroking his dick until he stops cumming. You lick the tip of his dick, licking up the last couple of drops of cum.'
 	*nl
-	'He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He then looks down at you and smiles. "Congratulations, you just passed P.E. Now you better get cleaned up." Satisfied, he turns and and walks out of the locker room, leaving you on your knees with his cum all over your face.'
+	'He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He then looks down at you and smiles. "Congratulations, you just passed P.E. Now you better get cleaned up." Satisfied, he turns and walks out of the locker room, leaving you on your knees with his cum all over your face.'
 	gs 'arousal', 'foreplay', 5
 	gs 'cum_call', 'face', 'A131'
 	gs 'arousal', 'end'

locations/gschool_socialchg.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'Pavlovsk slut':
 		if soniaPS = 0:
 			'"Go and hang out with the other losers because none of us give a shit about you anymore." Lazar says before turning and walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		else	
-			'"Go and hang out with the other losers because none of us give a shit about you anymore. I''m sure you and and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+			'"Go and hang out with the other losers because none of us give a shit about you anymore. I''m sure you and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		end	
 	elseif grupTipe = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'

locations/gschool_socialchg1.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'lazar_vaginal':
 				'You squeal at the pain and try to pull away, but he has a firm grip on your hips. When you try to pull away, he pulls you back as he pounds your ass without mercy. "Lazar, stop! That''s my ass!"'
 				'He keeps pounding away and grunting with exertion. "What?"'
 				*nl
-				'"I said that's my asshole! You're fucking my ass!" you cry out as you keep trying in vain to get him to slow down or pull away.'
+				'"I said that''s my asshole! You''re fucking my ass!" you cry out as you keep trying in vain to get him to slow down or pull away.'
 				'He looks at you before looking down. He slows down but doesn''t stop fucking you as he grins. "Sorry, I didn''t notice. Seriously, it was an accident! I''m almost there anyway."'
 				gs 'arousal', 'anal', 5, 'exhibitionism'
 				gs 'arousal', 'end'

locations/homes_properties.qsrc

@@ -540,7 +540,7 @@ if $ARGS[0] = 'get_properties_for_sale':
 				hasprice = iif($accessible_property[$getforsalespropcode] = '', property['price'] > 0, accessible_property['<<$getforsalespropcode>>-sales-price'] > 0)
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and hasprice:
 					$property_code[j] = $getforsalespropcode
-					$property_name[j] = iif($accessible._property[$getforsalespropcode] = '', $property['name'], $accessible_property['<<$getforsalespropcode>>-name'])
+					$property_name[j] = iif($accessible_property[$getforsalespropcode] = '', $property['name'], $accessible_property['<<$getforsalespropcode>>-name'])
 					$property_type[j] = iif($accessible_property[$getforsalespropcode] = '', $property['type'], $accessible_property['<<$getforsalespropcode>>-type'])
 					if property['construction_needed'] = 1:
 						$property_display[j] = iif($accessible_property[$getforsalespropcode] = '', $property['display_0'], $accessible_property['<<$getforsalespropcode>>-display'])
@@ -631,7 +631,7 @@ if $ARGS[0] = 'get_internet_enabled_properties':
 				accesscheck = ($ARGS[2] = 'hasaccess' and accessible_property[$getnetenabledprocode] ! 0 and accessible_property[$getnetenabledprocode] ! 4) or $ARGS[2] = ''
 				typecheck = (($ARGS[1] ! 'home' and INSTR($property['type'], 'residence') = 0) or ($ARGS[1] ! 'business' and INSTR($property['type'], 'residence') > 0))				
 				if accesscheck and typecheck and property['internet_enabled']:
-					$property_name[j] = $poperty['name']
+					$property_name[j] = $property['name']
 					$property_code[j] = $getnetenabledprocode
 					if accessible_property[$getnetenabledprocode] = 0: 
 						$property_status[j] = 'no access'

locations/hookup_after.qsrc

@@ -867,7 +867,7 @@ if $ARGS[0] = 'light_cigarette':
 					act'Continue':
 						cla & *clr
 						siga_bum = 1
-						gs 'drugs ', 'smoke'
+						gs 'drugs', 'smoke'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 						'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
@@ -885,7 +885,7 @@ if $ARGS[0] = 'light_cigarette':
 				'Pulling a cigarette from your purse, you place it in your mouth, sparking it with your lighter while you inhale.'
 				act'Continue':
 					cla & *clr
-					gs 'drugs ', 'smoke'
+					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
@@ -909,7 +909,7 @@ if $ARGS[0] = 'light_cigarette2':
 			cla & *clr
 			siga += 1
 			siga_bum = 1
-			gs 'drugs ', 'smoke'
+			gs 'drugs', 'smoke'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 			'He leans over with the lighter and lights it for you and you inhale with him, savoring the smoke that fills your lungs as the two of you sit back and puff away together.'
 			gs 'hookup_after', 'pre'
@@ -924,7 +924,7 @@ if $ARGS[0] = 'light_cigarette2':
 			'You decide to grab a smoke too, pulling one from your purse. You place it in your mouth, sparking it with your lighter while you inhale.'
 			act'Continue':
 				cla & *clr
-				gs 'drugs ', 'smoke'
+				gs 'drugs', 'smoke'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 				'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'start':
 	elseif hookup['cigarette'] = 3:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		if npc_smoker[$boy] > 0:
 			'Reaching down to your purse, you pull out your phone and a cigarette, sparking the latter and taking a long enjoyable drag from it. <<$npc_firstname[$boy]>> sees you light up and does the same, pulling his own smokes from his nightstand. The two of your relax, smoking together, while you unwind checking messages and scrolling through social media feeds.'
 		else
@@ -1411,16 +1411,16 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		siga += 1
 		siga_bum = 1
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		'The two of you lay back and relax, enjoying a post-fuck smoke together as you wind down.'
 	elseif npc_smoker[$boy] > 0 and hookup['cigarette'] = 1:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		'Seeing you light up, <<$npc_firstname[$boy]>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and relax, taking a long drag, relishing the flavor as it fills your mouth and lungs. The two of you just sit there in silence for a few minutes, enjoying a post-fuck smoke together as you wind down.'
 	elseif hookup['cigarette'] = 1:
 		cla & *clr
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 		'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'

locations/hotel_anna_gear.qsrc

@@ -1263,7 +1263,7 @@ if $ARGS[0] = 'restraints_cuff':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"Sure <<$pcs_nickname>>... just give me a moment." Anna starts freeing your ankles and wrists.'
-						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and and it seems you''ve learned enough today."'
+						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and it seems you''ve learned enough today."'
 						'"Just get me out of this please." Anna smiles as she removes your cuffs. Once your arms and legs are free you hurriedly get dressed, you chat a little with Anna before she she walks you to the front door and say goodbye and walk out to the residential area.'
 						act 'Leave': gt'pav_hotel'
 					end
@@ -1361,7 +1361,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... anyway we should stop for now. The walk ends. "We shouldn''t get carried away, this is a practice session after all, so <<$pcs_nickname>> I hope it has been instructive for you, you should have a better idea about the collar and the leash. You can get dressed now, and we''ll continue next time"'
-					'"Thank you Anna." You get dressed and and chat a little about collars before saying goodbye and leaving.'
+					'"Thank you Anna." You get dressed and chat a little about collars before saying goodbye and leaving.'
 					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':
@@ -1403,7 +1403,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... But we should stop for now." The walk ends. "We shouldn''t drag this on too long, this is for you to learn after all, so <<$pcs_nickname>> I hope it has been a learning experience for you, hopefully you should have a better idea about the collar and the leash. You can get dressed now, and we''ll follow up on this next time"'
-					'"Thank you Anna."You get dressed and and chat a little about collars before saying goodbye and leaving.'
+					'"Thank you Anna."You get dressed and chat a little about collars before saying goodbye and leaving.'
 					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':

locations/internet_mobile.qsrc

@@ -147,14 +147,14 @@ if $ARGS[0] = 'renew_subscription':
         karta -= finalfee        
         subscription['<<$ARGS[1]>>-discount'] = rem_discount
         if app_discount > 0: $discounttext = '<<renewfee>>₽ and you had <<acc_discount>><b>₽</b> left on your account. After applying <<app_discount>><b>₽</b> to your monthly fee, your final payable was <b><font color="green"><<finalfee>>₽</b></font>  and you were left with <<rem_discount>><b>₽</b> on your account.'
-        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was' + iif(app_discount > 0, $dicounttext, '<b><font color="green"><<renewfee>>₽</font></b> which was taken from your bank account.')
+        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was' + iif(app_discount > 0, $discounttext, '<b><font color="green"><<renewfee>>₽</font></b> which was taken from your bank account.')
         if subscription['<<$ARGS[1]>>-suspension_month'] > 0: subscription['<<$ARGS[1]>>-suspension_month'] = 0
         if subscription['<<$ARGS[1]>>-suspension_day'] > 0: subscription['<<$ARGS[1]>>-suspension_day'] = 0
     else
         remainingday = 5
         if subscription['<<$ARGS[1]>>-suspension_day'] > 0: remainingday = subscription['<<$ARGS[1]>>-suspension_day'] - day
         if app_discount > 0: $discounttext = ' and you had <<acc_discount>><b>₽</b> left on your account. After applying <<app_discount>><b>₽</b> to your monthly fee, your final payable was <<finalfee>><b>₽</b>  and you were left with <<rem_discount>><b>₽</b> on your account.'
-        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was <<renewfee>><b>₽</b>'+ iif(app_discount >0, $dicounttext,', unfortunately your payment was declined. We will try to take the payment over the next <b><font color="red"><<remainingday>> days</font></b> before suspending services.')
+        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was <<renewfee>><b>₽</b>'+ iif(app_discount >0, $discounttext,', unfortunately your payment was declined. We will try to take the payment over the next <b><font color="red"><<remainingday>> days</font></b> before suspending services.')
         gs 'internet_mobile', 'set_suspension_date', $ARGS[1]
     end
     killvar 'renewfee'
@@ -236,7 +236,7 @@ end
 !! $ARGS[2] - Custom message - optional
 if $ARGS[0] = 'add_limitation':
     access[$ARGS[1]] = 1
-    $access[$ARGS[1]] = $ARGS2
+    $access[$ARGS[1]] = $ARGS[2]
 end
 
 !!Remove the limiation passed in $ARGS[1] and set's it's custom message to ''
@@ -252,7 +252,7 @@ end
 !! $ARGS[1] - Limitation code: : 'noporn', 'nocamshow'
 !! $ARGS[2] - Custom message 
 if $ARGS[0] = 'set_limitation_message':
-    if access[$ARGS[1]] = 1: $access[$ARGS[1]] = $ARGS2
+    if access[$ARGS[1]] = 1: $access[$ARGS[1]] = $ARGS[2]
 end
 
 !! Sets the date when the subscription will be cancelled if not paid.

locations/katja_uni.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'experienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. Your tongue slips into her mouth and finds hers, carefully but eagerly pressing back against yours. You push it further, and you spend the next few minutes playing a full game of tonsil hockey.'
+		'You move closer to Katja and slowly put your lips to hers. Your tongue slips into her mouth and finds hers, carefully but eagerly pressing back against yours. You push it further, and you spend the next few minutes playing a full game of tonsil hockey.'
 		act'Continue':
 			cla & *clr
 			!! IMAGE HERE
@@ -1301,7 +1301,7 @@ if $ARGS[0] = 'inexperienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. Your tongue slips into her mouth and finds hers. She recoils on instinct but you chase after her, making sure her lips never leave yours. You push it further and end up spending the next few minutes playing a full game of tonsil hockey.'
+		'You move closer to Katja and slowly put your lips to hers. Your tongue slips into her mouth and finds hers. She recoils on instinct but you chase after her, making sure her lips never leave yours. You push it further and end up spending the next few minutes playing a full game of tonsil hockey.'
 		'Eventually, the two of you break apart, a thin trail of saliva trailing between her lips and yours.'
 		*nl
 		'"Whoa..." she murmurs. "That was something else..."'
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'no_experienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. The two of you awkwardly bump together, feeling the heat of your blushes radiating off each other''s cheeks. Very, very carefully, you experimentally push your tongue into her mouth. As soon as it touches her lips, she flinches but settles into it and clumsily tries to reciprocate, letting her tongue brush against your own.'
+		'You move closer to Katja and slowly put your lips to hers. The two of you awkwardly bump together, feeling the heat of your blushes radiating off each other''s cheeks. Very, very carefully, you experimentally push your tongue into her mouth. As soon as it touches her lips, she flinches but settles into it and clumsily tries to reciprocate, letting her tongue brush against your own.'
 		'Eventually, the two of you break apart, a thin trail of saliva trailing between her lips and yours.'
 		*nl
 		'"Whoa..." she murmurs. "That was something else..."'

locations/katja_uni_sex.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'library_threesome2':
 						act 'Switch positions':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_threesome8.jpg"></center>'
-							'You climb off his dick and and tell Katja that it''s her turn. You then guide his dick into her very wet pussy as she sits down on it. As she starts riding it, you get up and crawl over to <<$npc_nickname[$npclastgenerated]>>''s face before sitting on it and letting him eat your pussy.'
+							'You climb off his dick and tell Katja that it''s her turn. You then guide his dick into her very wet pussy as she sits down on it. As she starts riding it, you get up and crawl over to <<$npc_nickname[$npclastgenerated]>>''s face before sitting on it and letting him eat your pussy.'
 							gs 'arousal', 'cuni', 3, 'group'
 							gs 'stat'
 							act 'Get on all fours':

locations/meadow.qsrc

@@ -159,7 +159,7 @@ if $ARGS[0] = 'Mira':
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 			'"I think you are a responsible person, Mira. So, you can come to the meadow whenever it pleases you. But, I want this place to remain a secret, so you can never tell anyone about this place."'
-			'Mira readily agrees and is as happy as a lark. Mira energetically nods and says, "I''ll take this secret to the grave, I swear. But, if I don't, I'll grant you three wishes, which I promise I will perform no matter what..."'
+			'Mira readily agrees and is as happy as a lark. Mira energetically nods and says, "I''ll take this secret to the grave, I swear. But, if I don''t, I''ll grant you three wishes, which I promise I will perform no matter what..."'
 			act 'Finish': gt 'meadow', 'start'
 		end
 		act 'Sorry, I want to keep this meadow private':

locations/mey_home.qsrc

@@ -386,7 +386,7 @@ end
 
 if $ARGS[0] = 'mey_morning_vomit':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
-	'At that moment, a sharp knocking sounds on the door and and Tamara''s muffled voice comes through the fine wood.'
+	'At that moment, a sharp knocking sounds on the door and Tamara''s muffled voice comes through the fine wood.'
 	'"<<$pcs_nickname>>? Are you all right? I thought I heard you throwing up. Is everything okay?"'
 	
 	act'Everything is fine':

locations/uni_lessons.qsrc

@@ -1,7 +1,7 @@
 # uni_lessons
 close all
 !2021/22/12
-!! This file includes the code to make sure that the player characters can go to class and and exams when they are enrolled in the university.
+!! This file includes the code to make sure that the player characters can go to class and exams when they are enrolled in the university.
 !! The file does not include the selection of classes depending upon which program they are enrolled in only the part of the code that don''t depend on the program.
 !! The code for the individual programs is in uni_programs
 

locations/unused/webcam_site.qsrc

@@ -522,7 +522,7 @@ $webcam_show = {
 !------------------------------!
 !---------Sex - Vasily---------!
 !------------------------------!
-		if $loc='shulga_room' and npc_rel['A11'] >= 100 and week >= 6 and hour >= 15 and vgape < 3 and agape < 3 and pcs_vag >= 1 and my_show_sex = 0:
+		if $loc_arg ='livingroom' and npc_rel['A11'] >= 100 and week >= 6 and hour >= 15 and vgape < 3 and agape < 3 and pcs_vag >= 1 and my_show_sex = 0:
 			act 'Call Vasily and arrange a sex show':
 				gs'stat'
 				*clr

locations/vann.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'v2':
 			gs 'willpower', 'pay', 'self'
 			picrand = 75
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v3.jpg"></center>'
-			'"Let me help you..." you say sweetly. The guy pauses. "What?" he replies. You walk up to him and slide your hand under his towel, slowly jerking his cock in your hand. The guy relaxes and drops his towel as you drop to your knees and and keep stroking his shaft. He begins to moan in pleasure.'
+			'"Let me help you..." you say sweetly. The guy pauses. "What?" he replies. You walk up to him and slide your hand under his towel, slowly jerking his cock in your hand. The guy relaxes and drops his towel as you drop to your knees and keep stroking his shaft. He begins to moan in pleasure.'
 
 			act 'Get your pussy eaten':gt 'sex', 'kuni'
 			act 'Give him a blowjob':gt 'sex', 'minet'

locations/vasilyhome.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'livingroom':
 
 	roomsex_sonia = rand(0,100)
 	if roomsex_sonia <= 5 and soniaPS >=1 and sexev_sonya_count > 0 and ((week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20)):
-		gt 'vasily_home', 'vasily_sex_sonya'
+		gt 'vasilyhome', 'vasily_sex_sonya'
 	end
 	if roomsex_sonia >= 97 and soniaPS >=3 and sexev_sonya_count > 0 and week < 5 and hour >= 20:
 		gt 'vasily_home_sex', 'gang_sex_sonya'