Merge remote-tracking branch 'upstream/master'

locations/albina_chat.qsrc

@@ -434,7 +434,6 @@ if $ARGS[0] = 'sex_talk_start':
 end
 
 if $ARGS[0] = 'sex_talk':
-	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her sex life instead': gt 'albina_chat', 'anal'
@@ -448,11 +447,9 @@ if $ARGS[0] = 'sex_talk2':
 		AlbinaQW['chat_rand'] = rand(1,3)
 		if AlbinaQW['chat_rand'] = 1:
 			'"So what''s your favourite position?" she asks.'
-			act 'Missionary': gt 'albina_chat', 'Missionary'
-			act 'Doggystyle': gt 'albina_chat', 'Doggystyle'
-			act 'Cowgirl': gt 'albina_chat', 'Cowgirl'
-	elseif AlbinaQW['chat_rand'] = 2:
-			gs'albina_chat','sex_talk'
+			act 'Missionary': gt 'albina_chat', 'missionary'
+			act 'Doggystyle': gt 'albina_chat', 'doggystyle'
+			act 'Cowgirl': gt 'albina_chat', 'cowgirl'
 		else
 			gs'albina_chat','sex_talk'
 		end
@@ -472,14 +469,14 @@ if $ARGS[0] = 'missionary':
 		'"You''re trying to tell me that lying on your back doing nothing is ''nice''?" She rolls her eyes. "Nuh uh. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s romantic':
 		cla & *nl
 		'"It''s romantic!" you protest. "You can look up into his eyes when you cum. Or kiss. It makes it so much better."'
 		'"Romance is for decrepit old fucks," she rolls her eyes. "Nuh uh. Give it to me <i>dirty</i>. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s easy':
 		cla & *nl
 		'"It''s easy," you shrug. "I don''t have to do any work. Just lay there and get dicked."'
@@ -492,8 +489,7 @@ if $ARGS[0] = 'missionary2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -510,14 +506,14 @@ if $ARGS[0] = 'doggystyle':
 		'"I definitely get that," Albina says. "I love that about it too. All I want from a guy is for him to grab me by the hair, shove his cock up my ass, and spank me until I cum. Best night ever."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'It goes deeper':
 		cla & *nl
 		'"It goes deeper in doggy," you explain. "I feel like it <i>fills</i> me, hitting every part of my insides. It just feels the best in that position."'
 		'"Fuck yeah," Albina says. "Doggy is the only way to <i>really</i> get balls deep inside a girl. And then when you get grabbed by the hair and pulled back even harder? And when he shoves it up your ass and spanks you? Fuck me, I could cum just thinking about it."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'Easy spankings':
 		cla & *nl
 		'"I love getting spanked," you grin.'
@@ -530,8 +526,7 @@ if $ARGS[0] = 'doggystyle2':
 	pcs_horny += 15
 	gs'stat'
 	'You giggle at her answer, feeling warmth blossoming between your hips and wetness seeping from your pussy. With the "fuck me eyes" Albina is giving you think she''s probably feeling something similar.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -548,14 +543,14 @@ if $ARGS[0] = 'cowgirl':
 		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck." She then gives you a sly grin. "But riding dick is a close second for me."'
 		gs 'albina_chat','cowgirl2'
 	end
-	
+
 	act 'I like being in control':
 		cla & *nl
 		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
 		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
 		gs 'albina_chat','cowgirl2'
 	end
-		
+
 	act 'I like it when he grabs my breasts':
 		cla & *nl
 		'"I like having my boobs grabbed," you grin. "If I''m on top, then his hands are free to grope me."'
@@ -568,8 +563,7 @@ if $ARGS[0] = 'cowgirl2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -601,10 +595,10 @@ if $ARGS[0] = 'anal':
 		act 'I want to try it (shy)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-			'"Well..." you stammer. I... I want to try it and..."'
+			'"Well..." you stammer. "I... I want to try it and..."'
 			'Albina gives you a hard stare. "And you thought to ask the school buttslut how to do it?"'
 			'You stutter trying to form an answer, and she breaks into laughter.'
-			'"Relax <<$pcs_nickname>>, I''m fucking with you. What do you want to know?"'
+			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			*nl
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -623,7 +617,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Well... I- I''ve tried it a few times..." you stammer. "But it''s always been... painful... So I thought could ask-"'
-			'"The class buttslut about it?" Albina asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
+			'"The class buttslut about it?" she asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
 			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -632,7 +626,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"I''ve tried anal a few times, but it''s always painful and not very enjoyable," you explain. "So I thought-"'
-			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" Albina asks, glaring at you.'
+			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" she asks, glaring at you.'
 			'"Well... Yeah," you grin. "Is there a better person to ask than you?"'
 			'Albina laughs heartily and grins back at you.'
 			'"No, you''re probably right about that. I''m the queen of buttfucking. So what is it you want to know?"'
@@ -646,28 +640,28 @@ if $ARGS[0] = 'anal_questions_shy':
 		act 'Where do I start?':
 			cla & *nl
 			'"Well..." you mumble. "Where do I even start?"'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Good. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What position?':
 			cla & *nl
 			'"What... position should I have my first time in?" you ask shyly.'
-			'"You''re getting way too far ahead of yourself," Albina interrupts. "Here''s my advice: Start small."'
+			'"You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small," she replies.'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'Does it hurt?':
 			cla & *nl
 			'"Does it hurt?" you ask shyly.'
-			'"Oh man, if you''re asking that then you''re <i>definitely</i> not ready," Albina laughs. "Here''s my advice: Start small."'
+			'She smiles in reponse. "Oh man, if you''re asking that then you''re <i>definitely</i> not ready. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you... enjoy it?" you ask, cringing at how badly you phrased it.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			gs 'albina_chat','anal_end2'
 		end
 	end
@@ -678,21 +672,21 @@ if $ARGS[0] = 'anal_questions_open':
 		act 'Where do I start?':
 			cla & *nl
 			'"Where do I even start?" you ask.'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What''s the best position?':
 			cla & *nl
 			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
-			'"You''re getting way too far ahead of yourself," Albina interrupts, holding her hand up. "Here''s my advice: Start small."'
+			'She holds her hand up and interrupts you. "You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you enjoy it?" you ask, cringing at the memories of your past experiences.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			'"Yeah. It''s always too painful for me. I can''t even get wet."'
 			gs 'albina_chat','anal_end2'
 		end
@@ -707,12 +701,12 @@ end
 if $ARGS[0] = 'anal_end1':
 	*nl
 	'You thank her for her helpful advice and she continues answering your questions and giving you all the advice she feels you need to know.'
-	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," Albina says, shamelessly eye fucking you.'
+	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," she says, shamelessly eye fucking you.'
 	gs 'albina_chat','sex_talk'
 end
 
 if $ARGS[0] = 'anal_end2':
-	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench your asscheeks on what''s inside of you, whether that be a dildo or a fat cock."'
+	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench around what''s inside you, whether that be a dildo or a fat cock."'
 	'She grins at you. "If you ever want a <i>hands on</i> lesson, then I''m willing to ''teach'' you some things..."'
 	gs 'albina_chat','sex_talk'
 end

locations/booty_call_cum.qsrc

@@ -292,11 +292,11 @@ if $ARGS[0] = 'fuck_cum':
 		end
 		
 		if booty_call['condom'] = 1 and booty_call['no_condom'] ! 1:
-			if booty_call['he_ask_creampie'] = 1:
-				act'Come together':gs 'booty_call_cum', 'cum_condom'
-			else
+		!!	if booty_call['he_ask_creampie'] = 1:
+		!!		act'Come together':gs 'booty_call_cum', 'cum_condom'
+		!!	else
 				act'Let him come in the condom':gt 'booty_call_cum', 'cum_condom'
-			end
+		!!	end
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['orgasm'] < orgasm:
@@ -860,7 +860,7 @@ if $ARGS[0] = 'cum_mouth':
 		'You keep your lips wrapped tight around the tip of <<$npc_firstname[$boy]>>''s cock while he comes, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.'
 		act'Spit':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['spit'] = 1
 			booty_call['spit_count'] += 1
 			$booty_call['last_cum'] = 'spit'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'cum_mouth':
 		
 		act'Swallow':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['swallow'] = 1
 			booty_call['swallow_count'] += 1
 			$booty_call['last_cum'] = 'swallow'
@@ -1460,8 +1460,8 @@ if $ARGS[0] = 'cum_pullout':
 	if booty_call['pullout_ask'] = 1:
 		!! differing descriptions based on position
 		if $booty_call['position'] = 'miss':
-			$booty_call['cum_choice'] = 'pullout'
 			booty_call['cum_stomach'] += 1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			gs'cum_call', 'stomach',$boy,1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			'"Pull out!"'
@@ -1471,22 +1471,24 @@ if $ARGS[0] = 'cum_pullout':
 			booty_call['cum_back'] += 1
 			gs'cum_call', 'butt',$boy,1
 			gs'cum_call', 'back',$boy,1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			'"Pull out!"'
 			*nl
 			'At your words, he yanks himself from your pussy and begins furiously jacking off over your ass. Moments later, you feel hot viscious liquid spatter all over it and across your back.'
 		elseif $booty_call['position'] = 'cowgirl':
-			$booty_call['cum_choice'] = 'ass'
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			gs'cum_call', 'butt',$boy,1
 			booty_call['cum_ass'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 			'"Pull out!"'
 			*nl
-			'At your words, you jump off his cock and reach behind you to grab it with your hand, furiously jerking it. Moments later, you feel hot viscious liquid spatter all over your ass.'
+			'You slip off his cock just in time, as not even a second later you feel hot liquid spatter all over your ass.'
 		end
 	else
 		if $booty_call['position'] = 'miss':
 			gs'cum_call', 'stomach',$boy,1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			booty_call['cum_stomach'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			if booty_call['not_inside'] = 1:
@@ -1509,6 +1511,7 @@ if $ARGS[0] = 'cum_pullout':
 			gs'cum_call', 'back',$boy,1
 			booty_call['cum_back'] += 1
 			booty_call['cum_ass'] += 1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			if booty_call['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1525,6 +1528,7 @@ if $ARGS[0] = 'cum_pullout':
 			if booty_call['not_inside'] = 1:
 				gs'cum_call', 'stomach',$boy,1
 				booty_call['cum_stomach'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 				'"Not inside me!" you yelp frantically.'
 				*nl
@@ -1534,11 +1538,11 @@ if $ARGS[0] = 'cum_pullout':
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. Moments later, he ejaculates, sending cum spattering across your belly.'
 				end
 			else
-				$booty_call['cum_choice'] = 'pullout'
 				gs'cum_call', 'butt',$boy,1
 				gs'cum_call', 'back',$boy,1
 				booty_call['cum_back'] += 1
 				booty_call['cum_ass'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. He rips the condom off his cock and moments later, he ejaculates, sending cum spattering across your belly.'

locations/fit.qsrc

@@ -3,6 +3,8 @@
 CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
+	$loc = 'fit'
+	$loc_arg = 'start'
 	$menu_loc = 'fit'
 	$menu_arg = 'start'
 	killvar '$locclass'
@@ -46,7 +48,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-! Pay cash or card - Hooded Silence.
+!! Pay cash or card - Hooded Silence.
 
 	*nl
 	if abonement = 0:
@@ -88,16 +90,12 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	*nl
- 	'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
-	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 	*nl
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
 
-	
-
 	act 'Exit the locker room':
         if $clothingworntype ! 'nude' and PCloswimwear = 0:
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and fame['city_sport'] >=10:

locations/foto_models2.qsrc

@@ -824,7 +824,7 @@ if $ARGS[0] = 'jeff_modelling':
 	act'Continue':
 		if jeff['model'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

locations/hookup_after.qsrc

@@ -1813,6 +1813,7 @@ if $ARGS[0] = 'npc_date_request':
 			'"I won''t," you promise.'
 		end
 		'Your little exchange done, you wave him goodbye and head out the door.'
+		act'Leave':gt 'hookup_after', 'exit'
 	end
 	act'I''m not up for anything serious':
 		cla & *clr

locations/hookup_morning.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'confused':
 	'What happened last night...? You blink blearily, looking around, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
 	*nl
 	'That''s right! You hooked up with a guy last night and accidentally fell asleep in his bed...'
-	if npc_earlyriser[$boy] = 1:
+!!	if npc_earlyriser[$boy] = 1:
 		act'... <i>his</i> bed...?':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'confused':
 			'"Yeah," you mumble back.'
 			gs'hookup_morning','wakeup'
 		end
-	elseif npc_latesleeper[$boy] = 1:
+!!{	elseif npc_latesleeper[$boy] = 1:
 		act'What was his name?':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -186,7 +186,7 @@ if $ARGS[0] = 'confused':
 		end
 	else
 		
-	end
+	end}
 	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'guilt2':
 	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-	if npc_earlyriser[$boy] = 1:
+!!{	if npc_earlyriser[$boy] = 1:
 		!! for later: create option for him to burst in with breakfast in bed
 		if npc_apt_type[$boy] = 2:
 			'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'guilt2':
 		end
 	elseif npc_latesleeper[$boy] = 1:
 		'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-	else
+	else}
 		'<<$npc_firstname[$boy]>> stirs next to you.'
 		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
 			'"Hey," he mumbles, looking over. "What''s up? Something wrong?"'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'guilt2':
 				gs'hookup_morning','wakeup'
 			end
 		end
-	end
+!!	end
 end
 
 if $ARGS[0] = 'mom':
@@ -660,7 +660,7 @@ end
 	if npc_apt_type[$boy] > 2:
 !!		act'Put your underwear on':
 
-		act'Go explore his place':gt'hookup_morning','explore'
+!!		act'Go explore his place':gt'hookup_morning','explore'
 
 		act'Find the kitchen':
 

locations/pav_parkev.qsrc

@@ -337,6 +337,8 @@ if $ARGS[0] = 'go_for_walk2':
 		end
 		'You walk along one of the trails deep in the park, and there are few people around. You know the more secluded area of the park has a reputation for being dangerous. It is popular with couples seeking privacy, Gopnik, prostitutes plying their trade, and worse, criminals. The darkness from the night makes everything creepier. There are few light sources in this area. You occasionally hear the sounds of animals or even what seems like people''s voices. Still, the darkness makes it impossible to really see.'
 	end
+	
+	act 'Continue': gt 'pav_park', 'deeper_park'
 end
 
 if $ARGS[0] = 'walk2':

locations/shortgs.qsrc

@@ -755,25 +755,27 @@ if $ARGS[0] = 'clothing_state':
 end
 
 
-! Author - Hooded Silence
-! Date created - 26 Aug 22
-! Payment system - Used to pay for items in various game locations
-!
-! command syntax: gs 'shortgs', 'payments', value, 'method', 'item variable', item quantity, 'item description', 'return location', 'act'
-!
-! value = cost of goods. Required
-! method = how it''s to be paid cash or card. leave blank for both. Optional
-! Item Description - What''s been bought. Required
-! item variable = item variable to be purchased to be added to players inventory. Optional.
-! Item quantity = How many items to be added. Defaults to one - Optional.
-! Return Location - Where do you want the character to go to, it will be used in place of $loc, optional falls back to starting location.
-! Act - If there''s a specific act to return to, it will be used in place of $loc_arg. Optional
-!
-! Optional with no content are ignored.
-
-!Use stock image for the purchase screen?
+!! Author - Hooded Silence
+!! Date created - 26 Aug 22
+!! Payment system - Used to pay for items in various game locations
+!!
+!! command syntax: gs 'shortgs', 'payments', value, 'method', 'item variable', item quantity, 'item description', 'return location', 'act'
+!!
+!! value = cost of goods. Required
+!! method = how it''s to be paid cash or card. leave blank for both. Optional
+!! Item Description - What's been bought. Required
+!! item variable = item variable to be purchased to be added to players inventory. Optional.
+!! Item quantity = How many items to be added. Defaults to one - Optional.
+!! Return Location - Where do you want the character to go to, optional falls back to starting location.
+!! Act - If there's a specific act to return to. Optional
+!!
+!! Optional with no content are ignored.
+
+!! Use stock image for the purchase screen?
 
 if $ARGS[0] = 'payments':
+	*clr & cla
+	
 	if ARGS[1] = 0:
 		msg	'<b>Error, Cash Value not set.</b>'
 	end
@@ -790,7 +792,7 @@ if $ARGS[0] = 'payments':
 	$pay_section = iif ($ARGS[6] = '', $loc, $ARGS[6])
 	$pay_act = iif($ARGS[7] = '', $loc_arg, $ARGS[7])
 
-	! Construct payment call
+	!! Construct payment call
 	
 	if $pay_variable ! '':
 		$construct_cash = 'exec: gs ''shortgs'', ''paymentcomplete'', ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''cash'' & money -= <<pay_value>> & <<$pay_variable>> += <<pay_quantity>>'
@@ -800,16 +802,13 @@ if $ARGS[0] = 'payments':
 		$construct_card = 'exec: gs ''shortgs'', ''paymentcomplete'', ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''card'' & karta -= <<pay_value>>'
 	end
 
-
 	$pay_cash = '<a href="<<$construct_cash>>">Cash</a>'
 	$pay_card = '<a href="<<$construct_card>>">Card</a>'
 
-	*clr
-
 	!Use stock image for the purchase screen?
 	
 	if ($pay_method ! 'cash' and $pay_method ! 'card') and (pay_value <= money and pay_value <= karta + bankDebtLimit):
-		'How do you want to pay for  the <<$pay_desc>>? <<$pay_cash>> or <<$pay_card>>'
+		'How do you want to pay for the <<$pay_desc>>? <<$pay_cash>> or <<$pay_card>>'
 	elseif ($pay_method = 'cash' or $pay_method = '') and pay_value <= money:
 		'Pay for the <<$pay_desc>> with <<$pay_cash>>?'
 	elseif ($pay_method = 'card' or $pay_method = '') and pay_value <= karta + bankDebtLimit:
@@ -817,12 +816,11 @@ if $ARGS[0] = 'payments':
 	else
 		'You don''t have enough money in your purse or bank account for this item.'
 	end
-
-	! clean up all the variables
-
+	
 	act 'Cancel Payment' : gt $pay_section, $pay_act
 
-	
+	!! clean up all the variables
+
 	killvar 'pay_value'
 	killvar '$pay_method'
 	killvar '$pay_variable'
@@ -831,7 +829,7 @@ if $ARGS[0] = 'payments':
 	killvar '$pay_type'	
 end
 
-!payment complete
+!! Payment complete
 
 if $ARGS[0] = 'paymentcomplete':
 	*clr & cla
@@ -849,9 +847,12 @@ if $ARGS[0] = 'paymentcomplete':
 
 	gs 'stat'
 
-	act 'Finish payment' : gt $ARGS[1], $ARGS[2]
+	if $ARGS[1] ! '' :
+		$loc =  $ARGS[1]
+		$loc_arg = $ARGS[2]
+	end
+	act 'Finish payment' : gt $loc, $loc_arg
 end
 
+--- shortgs ---------------------------------
 
-
---- shortgs ---------------------------------

locations/therapist.qsrc

@@ -373,16 +373,16 @@ if $ARGS[0] = 'hypno':
 					if var2 = 1 :
 					$session = 'A charming woman understands her place in this world. A female must always show respect to men. She will put his needs before her own. This will make her feel more charming to the greater sex."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 2 :
+					elseif var2 = 2:
 					$session = 'A charming woman understands her place as a female. A charming woman understands to show respect and make herself sexually available to any male, especially those who are older than herself."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 3 :
+					elseif var2 = 3:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose in life is to bring pleasure to males and bear their children. Especially those who are much older than them."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 4 :
+					elseif var2 = 4:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose and duty in life is to bring pleasure to males, serve them in every way possible and bear their children. Especially those who are much older than them."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 5 :
+					elseif var2 = 5:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose and duty in her life is to have many children as possible especially with men who are much older than them."'
 					willpowermax -= rand(8,10)
 					else
@@ -446,80 +446,122 @@ if $ARGS[0] = 'hypno':
 					'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,3)>>.mp4"></video></center>'
 					'<font color="<<$hypnocolour>>">'
 					'You get up from the couch and start to take off all of your clothing.'
-					if hypnoTime < 4:
-						randSuck = rand(1,4)
-						if randSuck = 1:
-							$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-							act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-						elseif randSuck = 2:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoSitSuck'
-						elseif randSuck = 3:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoForceSuck'
-						elseif randSuck = 4:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoSuck'
+					if func('body_din','pregnancyVisibility') = 1 and HypnoPregNoticed = 0:
+						HypnoPregNoticed = 1
+						'After stripping off your clothes, the doctor takes a look at you and smiles at your pregnant stomach. He kneels before you and kisses your belly, sending a shiver up your spine. "Seeing you pregnant is a beautiful sight" he exclaims. "Is it mine?" he asks'
+						act 'Yes, <i>Master</i>':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+							'"Yes Master, It is yours" you say "Good, If anyone asks, you got raped and that''s how you think you got pregnant. One day you will learn that the child is mine, but for now, the child belongs to some random person on the street" he says and leads you to the couch to start the session.'
+							*nl
+							gs 'therapist', 'hypno2'
 						end
-					else
-						if hypnoTime < 10:
-							if rand(0,2) > 0:
-								$hypnoact = 'I will fuck your pussy.'
-								act 'Continue':gt 'therapist', 'hypnoFuck'
-							elseif rand(0,2) > 0:
-								randSuck = rand(1,4)
-								if randSuck = 1:
-									$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-									act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-								elseif randSuck = 2:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSitSuck'
-								elseif randSuck = 3:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoForceSuck'
-								elseif randSuck = 4:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSuck'
-								end
-							else
-								$hypnoact = 'I will fuck your ass.'
-								act 'Continue':gt 'therapist', 'hypnoAnal'
+						act 'No, <i>Master</i>':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+							'"No, Master, It belongs to (Brother/Fedor/Boyfriend) "Thats upsetting." he says. "Since you did allow someone else to get you pregnant, I must punish you" he says and bends you over his desk, takes off his belt and starts to whip your bare ass with it. "You will not feel this pain when you wake up, but you will feel that you shouldn''t let anyone else but me get you pregnant. Do you understand, Cunt"'
+							act 'Yes, <i>Master</i>':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+								'"All right, Now please lay on the couch so we can get started" he says putting his belt back on his pants but placing it unbuckled.'
+								*nl
+								gs 'therapist', 'hypno2'
 							end
-						!elseif rand(0,3) = 0:
-							!$hypnoact = 'I thought of something special for you.'
-							!act 'Continue':gt 'therapist', 'hypnoPerv'
-						else
-							if rand(0,2) > 0:
-								$hypnoact = 'I will fuck your pussy.'
-								act 'Continue':gt 'therapist', 'hypnoFuck'
-							elseif rand(0,2) > 0:
-								randSuck = rand(1,4)
-								if randSuck = 1:
-									$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-									act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-								elseif randSuck = 2:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSitSuck'
-								elseif randSuck = 3:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoForceSuck'
-								elseif randSuck = 4:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSuck'
+							act 'Yes, <i>Master</i>':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+								gs 'willpower', 'misc', 'resist', 'easy'
+								will_cost += (hypnoSchedule * 10)
+								will_cost += (hypnoStage * 10)
+								will_cost += hypnoTime * 3
+								if will_cost <= pcs_willpwr:
+									'"I love the baby''s father too much" you say and he sighs. We will have to do some more theopy to break you of that. You must only love me. Get on the couch with me.'
+								else
+									'"I... Yes, sir" you say. "I will not have unprotected sex with anyone except you," you explain. "Good Girl" he gives you a kiss before having you sit on the couch to start the session.'
 								end
-							else
-								$hypnoact = 'I will fuck your ass.'
-								act 'Continue':gt 'therapist', 'hypnoAnal'
+								*nl
+								gs 'therapist', 'hypno2'
 							end
 						end
 					end
-					'While you do this, Dr. Pavlov opens up his pants and takes out his dick, slowly masturbating as he watches you. After a while, he stops and motions you closer to him.'
+					gs 'therapist', 'hypno2'
+				end
+			end
+		end
+	end
+end
 
-					'"Come here, <i>Cunt</i>, <<$hypnoact>>"</font>'
+if $ARGS[0] = 'hypno2':
+	if hypnoTime < 4:
+		randSuck = rand(1,4)
+		if randSuck = 1:
+			$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+			act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+		elseif randSuck = 2:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoSitSuck'
+		elseif randSuck = 3:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoForceSuck'
+		elseif randSuck = 4:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoSuck'
+		end
+	else
+		if hypnoTime < 10:
+			if rand(0,2) > 0:
+				$hypnoact = 'I will fuck your pussy.'
+				act 'Continue':gt 'therapist', 'hypnoFuck'
+			elseif rand(0,2) > 0:
+				randSuck = rand(1,4)
+				if randSuck = 1:
+					$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+					act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+				elseif randSuck = 2:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSitSuck'
+				elseif randSuck = 3:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoForceSuck'
+				elseif randSuck = 4:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSuck'
+				end
+			else
+				$hypnoact = 'I will fuck your ass.'
+				act 'Continue':gt 'therapist', 'hypnoAnal'
+			end
+		!elseif rand(0,3) = 0:
+			!$hypnoact = 'I thought of something special for you.'
+			!act 'Continue':gt 'therapist', 'hypnoPerv'
+		else
+			if rand(0,2) > 0:
+				$hypnoact = 'I will fuck your pussy.'
+				act 'Continue':gt 'therapist', 'hypnoFuck'
+			elseif rand(0,2) > 0:
+				randSuck = rand(1,4)
+				if randSuck = 1:
+					$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+					act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+				elseif randSuck = 2:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSitSuck'
+				elseif randSuck = 3:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoForceSuck'
+				elseif randSuck = 4:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSuck'
 				end
+			else
+				$hypnoact = 'I will fuck your ass.'
+				act 'Continue':gt 'therapist', 'hypnoAnal'
 			end
 		end
 	end
+	'While you do this, Dr. Pavlov opens up his pants and takes out his dick, slowly masturbating as he watches you. After a while, he stops and motions you closer to him.'
+
+	'"Come here, <i>Cunt</i>, <<$hypnoact>>"</font>'
 end
 
 if $ARGS[0] = 'succubus':
@@ -1668,7 +1710,7 @@ if $ARGS[0] = 'hypnoRandom':
 		tabletkisug = 0
 		tabletkicheck = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"Now lets make sure you start having my children... <font color="<<$hypnocolour>>">Although you won''t consciously know my cum is inside of you, you will subconsciously feel it. Everytime I cum inside of you, your body will crave my seed more. You will keep your pussy clenched so my cum doesn''t leak out."</font>'
 		'<font color="<<$hypnocolour>>">Also, take these." He hands you a package of pills. "You will take one every day. If you have any birth control pills, you will throw them away. You won''t think about buying more. You won''t notice anything wrong with this and you will think these are simply normal birth control pills. Understand, <i>Cunt</i>?"</font>'
 		'"Yes, <i>Master</i>."'
@@ -1739,7 +1781,7 @@ if $ARGS[0] = 'hypnoRandom':
 	elseif hypnoCheckPanties ! 1 and rand(1,2) = 1 and hypnoPanty = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<br><font color="<<$hypnocolour>>">"From now on, when you come in for therapy you will feel that it is common courtesy to allow me to check if you are not wearing panties. You will think this is normal. In fact, if you are caught wearing panties, you will feel ashamed that you wore them. When I compliment you for not wearing panties, you will feel proud and grateful for the compliment.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'
@@ -1753,7 +1795,7 @@ if $ARGS[0] = 'hypnoRandom':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<br><font color="<<$hypnocolour>>">"From now on, when you come in for therapy you will feel that it is common courtesy to show me your bare pussy. You will think this is perfectly normal behavior. It is simply the polite thing to do. Any comments I make about your bare pussy you will be grateful for.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'
@@ -1762,6 +1804,26 @@ if $ARGS[0] = 'hypnoRandom':
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
+		!! Forced Clothing, Steva will want to wear exhibitionist clothing, failing that only clothing she finds "daring" or have a cost of willpower
+	elseif hypnoPanty = 1 & hypnoBra = 1:
+		hypnoClothes = 1
+		cla
+		*clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+		*nl
+
+		'<br><font color="<<$hypnocolour>>">"Okay, cunt. "He begins, setting up a new command;'
+
+		'"The only clothing you will be allowed to wear from now on are see-throught items. If you do not already have any in your closet, you will need to buy some. My daughter works in promotions for a store in town. You can usually find her in the park whenever she is out." '
+
+		'He adjusts his shirt, then adds...'
+
+		'"Lastly, if they do not have any school clothes, wear an outfit that exposes the most skin," he smiles. "Wearing normal clothing makes you feel self-conscious -- like to much clothing restricts your movement. You need to wear the bare minimum, Understand cunt?"'
+		'"Yes, <i>Master</i>."'
+		'"Good ..."<br>'
+		act 'Continue':
+			gt 'therapist', 'hypnoEnd'
+		end
 	! sveta now thinks it''s normal for pavlov to touch her innapropriatly
 	elseif hypnoTouchWhenever ! 1 and rand(1,2) = 1:
 		cla
@@ -1769,10 +1831,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoTouchWhenever = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will find it perfectly acceptable for me to touch you on any place of your body. It''s common sense that I should be able to touch you where ever and whenever I please. Any vulgar comments I make are perfectly normal. You won''t notice anything out of the ordinary.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1783,10 +1844,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoKissGoodbye = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, before you leave, you will feel that it is natural to kiss me before you leave as thanks for your therapy session. You won''t find anything wrong with this. Doing so will feel perfectly normal. When you kiss me, you will do so with enthusiasm. You will enjoy the kiss and you will prefer kissing with your tongue. When we are finished, you will thank me for the session.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1797,10 +1857,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoHardToCum = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will have difficulty orgasming if I''m not the one making you cum.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1811,7 +1870,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoAskFuck = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will feel that it is perfectly normal for you to ask me to fuck you instead of asking for therapy sessions. In fact, you will think that taking my cock is simply a normal therapy session and that doing so is not sex at all. Also, anytime you see my cock, your mind will enter the black room.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'