locations/LOCA.qsrc

@@ -9,32 +9,27 @@ end
 if settingmode = 0: killvar 'cheatmenu'
 
 !{
-msg "Changed Location 
-	$menu_loc		<<$menu_loc>> 
-	$menu_arg		<<$menu_arg>> 
-	$loc_arg		<<$loc_arg>> 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$menu_loc		<<$menu_loc>>
+	$menu_arg		<<$menu_arg>>
+	$loc_arg		<<$loc_arg>>
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locM			<<$locM>>
 	$locclass		<<$locclass>>"
 
-msg "Changed Location 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locclass		<<$locclass>>"
 }
 
 if mod_list > 0:
-	mod_i=1
+	mod_i = 1
 	:mod_exec
-	if $mod_name[mod_i] ! '':
-		gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
-	end
-	
-	if mod_list > mod_i:
-		mod_i+=1
-		jump 'mod_exec'
-	end
+		if $mod_name[mod_i] ! '': gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
+		mod_i += 1
+	if mod_i <= mod_list: jump 'mod_exec'
 end
 
 --- LOCA ---------------------------------

locations/MagEncounterFairy.qsrc

@@ -150,13 +150,13 @@ if $ARGS[0] = 'fairy_chat':
 					pcs_horny += 10
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples<<max(1,min(5,pcs_nips/20+1))>>.jpg"></center>'
-					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
+					'You hear a giggle. Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise = 2:
 					pcs_nips -= 5
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples<<max(1,min(5,pcs_nips/20+1))>>.jpg"></center>'
-					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, yet seem to be smaller then before.'
+					'You hear a giggle. Suddenly, your nipples get really firm and pointed, yet seem to be smaller than before.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise = 3:
 					clit_size += 5
@@ -172,15 +172,15 @@ if $ARGS[0] = 'fairy_chat':
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/clit/clit<<max(1,min(5,clit_size/20+1))>>.jpg"></center>'
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
-					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
+					'Your clitoris has shrunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
 				elseif fairy_surprise <= 6:
 					min_arousal += rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
-					'You suddenly feel flustered and more aroused then before.'
+					'You suddenly feel flustered and more aroused than before.'
 				else
 					min_arousal -= rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
-					'You suddenly feel colder and less aroused then before.'
+					'You suddenly feel colder and less aroused than before.'
 				end
 				gs 'stat'
 				act 'Go on your way': gt $loc, $loc_arg
@@ -243,8 +243,8 @@ if $ARGS[0] = 'teleport':
 		'She giggles. "This lets you dance through any field you like! "Let''s go!"'
 		'She grunts and give you a nudge into the circle.'
 		act 'Stumble into Circle':
-			'The view outside the circle seems blurry and a little indistinct.  The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that.  Though you can''t tell exactly where you are now in the blurriness, it does look different.'
-			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
+			'The view outside the circle seems blurry and a little indistinct. The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that. Though you can''t tell exactly where you are now in the blurriness, it does look different.'
+			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back." She flies off.'
 			'You decide it would be wise to memorize your surroundings.'
 			spellKnown['teleport'] = 1
 			tpKnown['gad_forest'] = 1

locations/MartinTalk.qsrc

@@ -9,7 +9,7 @@ menu_off = 1
 if $ARGS[0] = '':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-		
+
 	if MartinTalkVar = 0:
 		MartinTalkVar = 1
 		'"Sure, <<$pcs_firstname>>, coming right up", Martin says and pours you your drink.'
@@ -34,27 +34,27 @@ if $ARGS[0] = '':
 		'Martin is taken aback by your question at first, making you cringe in fear that you might have gone too far... but then he bursts into laughter. "That, mi amor, is a story for another day. Enjoy your drink before it gets warm."'
 		*nl
 		'With that, he directs his attention at another visitor of the bar. You notice that you''ve been holding your breath and release it now, glad you didn''t piss him off. Watching Martin from afar, you nurse on your beverage until you find it empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 1:
 		MartinTalkVar = 2
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
-		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:' 
+		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:'
 		'"Can I ask you something?"'
 		*nl
 		'Martin musters you for a long second before responding. "You wanna know why I''m here in Russia, don''t you?"'
 		'You blush slightly. "Is it that obvious?"'
-		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.' 
+		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.'
 		'"Sorry, I didn''t mean to pry." You quickly decide to drop the subject. "You just... stand out, you know?"'
 		'His features soften, and he seems appeased by your words. "Yeah, I guess I do." He sighs. "I''m sorry for snapping."'
 		*nl
 		'You look at each other for a little longer, but it''s awkward and neither of you really knows where to go from here.'
 		'"Guess I better get back to work," he says, and you agree, glad that he broke the uncomfortable silence and leaves you to your beverage.'
 		'Maybe you can satisfy your curiosity about him at a later date. If he talks to you at all, that is.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 2:
 		MartinTalkVar = 3
 		'The barman gives you nod and before you know it, your drink sits on the counter.'
@@ -86,9 +86,9 @@ if $ARGS[0] = '':
 		'He bursts into laughter. "Maybe you are, maybe you aren''t; but you are alright either way, corazón."'
 		*nl
 		'With that, he leaves you to your drink. Minutes pass as you enjoy your beverage, only stopping when you find your glass empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 3 and npc_rel['A216'] >= 20:
 		MartinTalkVar = 4
 		'Martin nods, and seconds later, a drink sits in front of you.'
@@ -102,25 +102,25 @@ if $ARGS[0] = '':
 		'"Yes, actually. After our last few chit chats, you must be bursting with curiosity. To be honest, I''m surprised you haven''t tried to ambush me while I close for the night."'
 		'"Uh, okay..."'
 		*nl
-		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"' 
+		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"'
 		'But you stop. You saw the corner of his mouth twitch. "You aren''t gonna <b>answer</b> whatever question I ask you, would you?"'
 		'"Oh no, of course not," he shakes his head with a sly grin, "we barely know each other."'
 		*nl
-		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.' 
+		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.'
 		*nl
 		'As gruff and menacing as Martin looks and acts sometimes, it''s good to know that he will pull your leg and laugh about just like anybody else. His shell may be hard but there''s definitely more to him than that. You''re not sure that his core is soft, but whatever it is, it''s bound to be interesting. And as strange as this episode was, it feels like something changed, like, after chipping away at it for a while, you finally broke the ice.'
 		*nl
 		'And armed with that knowledge and a newfound ease, you chat and joke with Martin a while longer before another patron demands his attention.'
 		$OpenInnerThought+'Hm... Maybe I really should try and talk to him when he''s starting to clean up and close for the night - I think he starts throwing people out around quarter to Midnight.'+$CloseInnerThought
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-				
+
 	elseif MartinTalkVar = 4 and npc_rel['A216'] >= 28:
 		MartinTalkVar = 5
 		'Martin wordlessly puts your usual drink in front of you, then examines you like he''s seeing you for the first time.'
 		*nl
 		'"You''re skinny," he observes.'
-		'"Excuse me?"' 
+		'"Excuse me?"'
 		'You ' + iif($bodyVars['desc']='skinny','would call yourself skinny, too, but','see yourself as <<$bodyVars[''desc'']>> rather than skinny, so') + ' you don''t really see why he would bring this up.'
 		*nl
 		'"Are you eating right, <<$pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
@@ -136,9 +136,9 @@ if $ARGS[0] = '':
 		'"That''s the one you should go to. The owners, Eugene and Angela, they are good people. Honest people. Give their place a visit sometime, you won''t regret it. Their shashlik is exceptional."'
 		'"Suuure," you say and watch Martin walk off.'
 		'Either there was a point to this that you missed completely, or you really look <b>that</b> skinny to him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 5:
 		MartinTalkVar = 6
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
@@ -163,9 +163,9 @@ if $ARGS[0] = '':
 		'"Martin musters you once more. "I can be both," he grins.'
 		'"And do you find me attractive?" You ask innocently.'
 		'"That''s for me to know and for you to find out, <<$pcs_nickname>>." With that, he turns and leaves you to drink and ponder his noncommittal answer.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 6 and npc_rel['A216'] >= 35:
 		MartinTalkVar = 7
 		'"Of course, <<$pcs_firstname>>," Martin says and prepares your poison of choice. "Here you go."'
@@ -190,18 +190,18 @@ if $ARGS[0] = '':
 		'"You should share that thought at the next book club meeting," you comment dryly.'
 		'"I''d rather not. It would only disturb the other housewives," Martin retorts.'
 		*nl
-		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.' 
+		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.'
 		'That thought is what makes you say: "If it''s any consolation: I didn''t think you were running anything bad. I think you''d rather feed the homeless than sell them heroin."'
 		'"Maybe I''m just a good actor," he suggests.'
 		'"Maybe," you concede, "or maybe there''s actually a nice guy hiding under those muscles and tattoos."'
 		*nl
 		'For a fraction of a second, it looks like he is going to say something, but instead he just gives you a warm smile and you respond in kind, before Martin has to go back to work, leaving you to enjoy your drink in peace.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 7:
 		MartinTalkVar = 8
-		'Martin gives you a nod and before you know it, your beverage sits in front of you.' 
+		'Martin gives you a nod and before you know it, your beverage sits in front of you.'
 		*nl
 		'As you grab hold of the glass, the bartender gives you a long look. "So..."'
 		'"So...?"'
@@ -210,7 +210,7 @@ if $ARGS[0] = '':
 		*nl
 		'"Let''s start with what you asked me last time, then: What do <b>you</b> do when you are not sitting here, drinking my booze and enjoying my company?"'
 		*nl
-		
+
 		act 'A lot of things':
 			cla
 			$MartinHobby = 'dark secret hobbies'
@@ -227,10 +227,10 @@ if $ARGS[0] = '':
 			'You size him up and nod emphatically. "Yeah, if this was an episode on a crime show, you''d be devoted father of three the police suspect first because of he looks the part."'
 			'"And what would you be? The murderous housewife? Or the overambitious new detective?"'
 			'"Why not both?" You laugh, and Martin joins you.'
-			
+
 			act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 		end
-		
+
 		if pcs_stren > 60 or pcs_agil > 60:
 			act 'Fitness training':
 				cla
@@ -240,11 +240,11 @@ if $ARGS[0] = '':
 				'"That''s good to know," you smile.'
 				'"You train at the gym?"'
 				'"I go to the gym sometime," you shrug, "but a lot of what I do I can do at home, when I have some a few hours to myself."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-				
+
 		if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
 			act 'Dancing':
 				cla
@@ -254,11 +254,11 @@ if $ARGS[0] = '':
 				'"It is, and it does," you agree, "but it''s really fulfilling to go on stage, do a routine and earn people''s applause."'
 				'"Ever thought about doing it professionally?" He asks.'
 				'"I don''t know. Maybe? Even when you''re really good, there are so many people who are better, so I don''t think it would be easy to make a living on dancing. But," you smile, "yeah, I guess I''d like to be good enough to do it professionally."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if runnerQW['pav_wins2'] > 0:
 			act 'Athletics':
 				cla
@@ -268,11 +268,11 @@ if $ARGS[0] = '':
 				'You roll your eyes at his awful joke. "Riiight, thank you for your support. And here I thought you''d approve of anything sportive."'
 				'"Oh, I do," he concurs. "I just never saw the appeal of dashes and marathons. And you didn''t strike me as the competitive type."'
 				'You shrug. "It''s part of what I like about it, I guess, but... I don''t know. It just feels right, in a way - the right mix of exhausting and satisfying."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if volleysostav > 0:
 			act 'Volleyball':
 				cla
@@ -282,11 +282,11 @@ if $ARGS[0] = '':
 				'"Oh no, it''s actually kind of a big deal here in St. Petersburg. And in Russia, I guess. When you do it professionally, anyway."'
 				'"And you do it professionally?"'
 				'"Uh, well... I''m in a team and... we don''t lose every game. Does that count?"'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_sewng > 40:
 			act 'Sewing':
 				cla
@@ -296,12 +296,12 @@ if $ARGS[0] = '':
 				'"Yeah, I did. What''s wrong with that?" You ask, irritated.'
 				'"I''m sorry." Martin puts up his hands defensively. "Nothing''s wrong with that. I was just surprised, is all. You didn''t strike me as the type who liked to sit down and make their own clothes."'
 				'"Well, I guess I am," you say firmly.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
-		if chess_rank > 0:		
+
+		if chess_rank > 0:
 			act 'Chess':
 				cla
 				$MartinHobby = 'latest chess game'
@@ -310,15 +310,15 @@ if $ARGS[0] = '':
 				'"Does it, now?" You give him a wry smile. "What part of it? The one where a horse tears down a tower?"'
 				'He laughs. "That too. But I was more thinking of preparation: A good chess player anticipates all the moves his opponent can make before they have even thought of them. Preparation and good memory will get you far in life."'
 				'"I guess you''re right. But it''s fun either way, and who knows: Maybe you can call me Galina Kasparova soon." You grin.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_vokal > 40 or pcs_instrmusic > 40:
 			act 'Making Music':
 				cla
-				if pcs_vokal >= pcs_instrmusic: 
+				if pcs_vokal >= pcs_instrmusic:
 					$MartinHobby = 'singing exercises'
 				else
 					$MartinHobby = 'finger exercises'
@@ -328,11 +328,11 @@ if $ARGS[0] = '':
 				'"Oh, stop it," you say, flattered by his compliment. "Would you like to, I don''t know, hear something sometime?"'
 				'Martin gives you a look of pure horror. "Oh god, please no."'
 				'If looks could kill, Martin would drop dead on the spot. "You are such an asshole, you know?" But his laugh is infectious, and you cannot help but join him.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if kickbox['sash'] > 0:
 			act 'Kickboxing':
 				cla
@@ -342,15 +342,15 @@ if $ARGS[0] = '':
 				'"Yeah, that''s part of the reason why I started with that," you agree.'
 				'"But it''s not the only one, I assume?"'
 				'"Well, at first it was just fun learning how to beat the crap out of guys," you grin, "but it takes a lot of discipline and dedication, and there''s always room for improvement. No matter how good you are, it stays a challenge, and I think I want or maybe even need that in my life."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_photoskl > 40 or pcs_artskls > 40:
 			act 'Art':
 				cla
-				if pcs_artskls >= pcs_photoskl: 
+				if pcs_artskls >= pcs_photoskl:
 					$MartinHobby = 'drawings and paintings'
 				else
 					$MartinHobby = 'photography'
@@ -360,52 +360,52 @@ if $ARGS[0] = '':
 				'"Well, I don''t know if I have talent," you respond sheepishly.'
 				'"Nonsense," Martin insists, "I''m sure you are great. I couldn''t do what you do."'
 				'"Of course you could. It doesn''t matter if you feel like you can or can''t do it. I mean, I don''t know if I''m any good at it, but I really like the way it allows me to capture what I see and the way it feels, you know?" You look at your beverage, embarrassed. "God, just listen to me: I sound like one of those pretentious yuppies who glue two pieces of wood together and call it art."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
-		end		
-	
+		end
+
 	elseif MartinTalkVar = 8 and npc_rel['A216'] >= 42:
 		MartinTalkVar = 9
 		'Martin nods and a few seconds later, a drink sits in front of you.'
 		*nl
-		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.' 
+		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.'
 		*nl
 		'You don''t know if it''s that contemplative aura of his or a question that you''ve been subconsciously waiting to ask, but the question of questions is out before you even know it: "Do you believe in god, Martin?"'
-		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.' 
+		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.'
 		'"I used to," he admits after a moment. "I was brought up in the Catholic faith, at least. If you didn''t say your prayer, you didn''t get your supper." He smirks, but his eyes speak of fond memories.'
 		'"But you don''t believe in that anymore?"'
 		'He shakes his head wordlessly. Instead, he does something you don''t think you''ve ever seen him do while the bar is open: He pours himself a glass of tequila and, after regarding it for a moment, slams it back.'
 		*nl
 		'It''s fairly obvious that this is a sensitive topic, and you barely dare to raise your voice. "What happened?"'
 		'He sighs deeply; not at your question, you feel, but at his own answer: "Life happened, corazón. Life can make or break someone''s faith. Me, I eventually figured that either there was no god or the filio di puta had a really twisted sense of humor and didn''t deserve my faith." The bitterness in his voice is almost palpable.'
-		
+
 		act 'What happened to him?':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 			'The question is burning under your nails: What could have brought this man to the other end of the world? But you realize that he has opened up to you in good faith, not because you pressed him for answer. He would only tell you as much as he wanted to, and pushing him would get you nowhere.'
-			'So, you do what friends do: You try not to be an ass.' 
+			'So, you do what friends do: You try not to be an ass.'
 			'"That bad?" You ask carefully.'
 			*nl
-			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.' 
+			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.'
 			'"What about you, <<$pcs_firstname>>? Do you believe in some higher power?"'
 			*nl
 			if $start_type[1] = 'nomagic':
-				'You ponder the question for a moment before you answer.' 
-				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."' 
+				'You ponder the question for a moment before you answer.'
+				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."'
 				*nl
-				'You pause for a moment, still not sure what you believe.' 
+				'You pause for a moment, still not sure what you believe.'
 				'"Now... now there are times when I go to church and I don''t really know why I went there, like I was looking for something more, something new, but it''s not there. And sometimes," you smile awkwardly, "sometimes I walk around town, see something strange and amazing and I feel... good. Connected, somehow." You shrug. "So, am I religious? Am I crazy? You tell me."'
 			else
-				'"More than you can imagine," you murmur.' 
-				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?' 
+				'"More than you can imagine," you murmur.'
+				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?'
 				*nl
-				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:' 
+				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:'
 				'"I... I feel like- no, I <b>know</b> that there''s something most people can''t see, something that doesn''t make any logical sense, and yet it is there, all around us, all the time, and it affects us in so many ways."'
 				'You are struggling for words. It''s all so clear in your head, but putting it in a way that doesn''t get you admitted to an asylum is so hard.'
 				'"I used to believe that the world is what everybody can see, smell, feel, and that''s it. But I- I''ve experienced something, something I can''t..." You trail off and stop. You can hear yourself chuckle - you just can''t help it. "I can''t explain it, can''t even describe it, but... but it changed everything for me." You smile awkwardly. "God, I must be sounding like a complete lunatic to you."'
 			end
-			
+
 			act 'Raving lunacy':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
@@ -418,11 +418,11 @@ if $ARGS[0] = '':
 				'"I don''t know what you''re talking about, girl - I look fantastic." Martin laughs.'
 				*nl
 				'For a moment, you want to talk back, stop him from deflecting your heartfelt compliment like that, but then you just smile and hold your tongue because you notice that Martin hasn''t let go of your hand and, after his laughter has subsided, he''s giving you a smile full of gratitude.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 9 and npc_rel['A216'] >= 48:
 		MartinTalkVar = 10
 		'"Here you go." Martin puts your drink in front of you before you''ve even properly come to rest on the stool. '+$OpenInnerThought+'When your bartender has your drink ready by the time you order it, maybe you''ve been spending too much time in the bar,'+$CloseInnerThought+' you think to yourself.'
@@ -431,13 +431,13 @@ if $ARGS[0] = '':
 		'Martin shrugs. "Same as always: You kill a man, you move on."'
 		'You laugh at his remark, but when he doesn''t join in, you stop and look at him uncertainly. "You <b>are</b> joking, right?"'
 		'He gives you a mysterious smile but otherwise ignores the question. "How about you? Rough day at the office?" He pauses. "Wait, do you even work in an office?"'
-		
+
 		act 'Give a non-committal answer':
 			cla
 			npc_rel['A216'] -= 2
 			'"Oh, you know, this and that. Whatever covers the bills. I get by"'
 			*nl
-			
+
 			if fame['city_porn'] <= 30:
 				'"Is remaining mysterious part of the job description?"'
 				'"You''d like to know that, wouldn''t you?" You tease.'
@@ -449,7 +449,7 @@ if $ARGS[0] = '':
 				'"I know that you are... doing porn," Martin tells you quietly.'
 				'Your face falls. You try to keep your cool, but you''re feeling cold all of a sudden. Why is he bringing this up?'
 				*nl
-				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.' 
+				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.'
 				'"How in the world did a young, pretty girl like you end up doing that?" He asks.'
 				*nl
 				'You''re not sure if he''s genuinely interested in an answer or just hiding his disgust - or lechery - really well, but you respond: "I... well, I like exposing myself... and I like sex. And it pays really well. So, I thought..." You trail off.'
@@ -465,28 +465,28 @@ if $ARGS[0] = '':
 				'He gives you a careful smile. "Some girl I know told me that she believed in good people. So I figured, maybe he existed and was just a really good guy."'
 				'His smile infects you too. "Yeah, maybe."'
 				*nl
-				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:' 
-				'"So, where do you live?"'	
+				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:'
+				'"So, where do you live?"'
 			end
 			act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 		end
-			
-		if SchoolAtestat = 0: 
+
+		if SchoolAtestat = 0:
 			act '"I''m still going to school"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 				'"No, actually, I''m still going to school."'
 				'You regret your words almost immediately when Martin''s face darkens. "Still going to school, huh? What about you being 18?"'
 				*nl
-				
+
 				if pcs_persuas < 30:
 					gs 'exp_gain', 'persuas', rand(2,5)
-					
+
 					if age >= 18:
 						gs 'npc_relationship', 'modify', 'A216', -10
 						pcs_mood -= rand(3,5)
 						'"I, uh... I''m <<age>> now," you stammer.'
-						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"' 
+						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"'
 						'He''s clearly angry with you, but he seems to be more disappointed than angry.'
 						'"I''m sorry," you say quietly. You don''t know what else you can say - there probably isn''t anything you could add or explain that wouldn''t make this worse.'
 						'Martin slowly shakes his head, but then, just when you think he''s gonna say something else, he just walks off to tend to another customer.'
@@ -494,7 +494,7 @@ if $ARGS[0] = '':
 						'You don''t think you''re off the hook - this definitely hurt your relationship with him. But it''s probably a good sign that he didn''t throw you out, so if you give him some space and keep your conversation with him light, you could probably recover from this.'
 
 						act 'Finish your drink': gt 'qwBarPolet', 'bar'
-					
+
 					else
 						gs 'npc_relationship', 'modify', 'A216', -20
 						pcs_mood -= rand(3,6)
@@ -516,10 +516,10 @@ if $ARGS[0] = '':
 						'With no choice but to comply, you get up and leave the bar.'
 						*nl
 						'This definitely could have gone better...'
-						
+
 						act 'Leave the bar': gt 'city_industrial'
 					end
-				
+
 				else
 					gs 'exp_gain', 'persuas', rand(4,6)
 					npc_rel['A216'] -= 2
@@ -533,13 +533,13 @@ if $ARGS[0] = '':
 					'Regardless of the rest, at least the last bit is definitely honest, and Martin seems satisfied with that. He gives you nod that''s slightly more curt than usual, then walks off to serve another customer.'
 					*nl
 					'You just about managed to save the situation, and you are pretty sure this could have gone A LOT worse, but Martin definitely needs a moment to cool it, and you are suddenly very grateful to have a drink in front of you and a moment to yourself.'
-					
+
 					act 'Finish your drink': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
-		
-		if func('uniutil', 'student', 'enrolled'): 
+
+		if func('uniutil', 'student', 'enrolled'):
 			act '"I''m a university student"':
 				cla
 				'"I''m going to university," you say, your voice somewhere between pride and shame: Pride over the privilege of receiving a higher education, and shame in the face of thinking of yourself as ''privileged'' while talking to Martin, who you think didn''t have that option... or did he?'
@@ -551,12 +551,12 @@ if $ARGS[0] = '':
 				'"Yeah. Well, I''ve got a room there, at least. I wouldn''t call it living."'
 				'"It can get pretty wild there during the weekend, I heard," Martin comments, "and drunk people can be unpredictable. You watch yourself, okay?"'
 				'"I always do," you reply with a smile, touched by his concern.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if work = 0: 
+
+		if work = 0:
 			act '"I don''t have a job"':
 				cla
 				'"I''m still trying to find the right thing for me," you say, fidgeting with your glass, almost certain about what he''s going to respond.'
@@ -569,11 +569,11 @@ if $ARGS[0] = '':
 				'"Well, here''s to the spirit of equality," you raise your glass and take a gulp.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 		if tanwork = 1:
 			act '"I''m a maid"':
 				cla
@@ -592,12 +592,12 @@ if $ARGS[0] = '':
 				'"And did it get ''weird''?" Martin asks carefully.'
 				'"Like I said, I''m fine," you placate him once again. "It makes sense. I gotta make breakfast and all that, and I have a big room to myself, AND the apartment is right in the city center, so, really, it''s all I could ask for."'
 				'"Well, as long as you''re happy with it." Martin, however, doesn''t sound very happy. Could he be jealous of Nicholas?'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1: 
+
+		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1:
 			act '"I''m a secretary"':
 				cla
 				'"I''m working as a secretary."'
@@ -612,16 +612,16 @@ if $ARGS[0] = '':
 				'It''s Martin who finally breaks it. "So, uh... How is your work?"'
 				'You shrug. "Lots and lots of paperwork, and my boss can be hard on me sometime."'
 				*nl
-				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.' 
+				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.'
 				'"Well, everybody''s gotta earn their salary somehow," he says instead, and you simply nod in response.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, and in an attempt to end this talk on a higher note, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workFabrika = 1: 
+
+		if workFabrika = 1:
 			act '"I work in a factory"':
 				cla
 				'"I''m working in a textile factory."'
@@ -634,12 +634,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workKafe['job'] = 1: 
+
+		if workKafe['job'] = 1:
 			act '"I work as a waitress"':
 				cla
 				'"I am a waitress in a cafe."'
@@ -654,12 +654,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if young_shop_work = 1: 
+
+		if young_shop_work = 1:
 			act '"I work in a clothing store"':
 				cla
 				'"I work in a clothing store."'
@@ -675,12 +675,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workrin = 1: 
+
+		if workrin = 1:
 			act '"I''m working a market stand"':
 				cla
 				'"I work at a market stand in Pavlovsk."'
@@ -696,12 +696,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting the somewhat gloomy turn this talk took sink in as you try to think of something to lighten the mood.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if stripwork = 1: 
+
+		if stripwork = 1:
 			act '"I work at a strip club"':
 				cla
 				'You blush slightly, but decide to be honest with Martin: "I work in a strip club... as a stripper."'
@@ -715,12 +715,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting your admission sink in and trying to find a topic that can lighten the mood a little.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if fame['city_modelling'] > 30: 
+
+		if fame['city_modelling'] > 30:
 			act 'Tell him you''re a model':
 				pcs_horny += rand(1,5)
 				cla
@@ -736,16 +736,16 @@ if $ARGS[0] = '':
 				*nl
 				'It is strangely flattering to know that Martin looked at nude pictures of you. Perhaps he was even jerking off to them... not that he''d admit it.'
 				*nl
-				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:' 
+				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:'
 				'"So, uh... where do you live?"'
 				'You chuckle to yourself and decide to let him off the hook... for now.'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 10 and MartinSex = 1:
-		MartinTalkVar = 11	
+		MartinTalkVar = 11
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
 		*nl
 		'You smile gratefully and take a gulp. Now that you are sitting here, right in front of him, it hits you all over again: You had sex with Martin!'
@@ -772,10 +772,10 @@ if $ARGS[0] = '':
 		'Do you have feelings for Martin beyond physical attraction?'
 		'Well, it doesn''t really matter now. It''s probably the best you could have hoped for: You have friend and experienced lover you can hook up with whenever you feel like it and who just told you that neither of you have to worry about the other''s feelings too much.'
 		'After all, you weren''t actually looking for a serious relationship with a man old enough to be your father, were you?'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
-		
+
+
 	elseif MartinTalkVar = 11 and MartinSex = 1 and npc_rel['A216'] >= 64:
 		MartinTalkVar = 12
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
@@ -802,9 +802,9 @@ if $ARGS[0] = '':
 		'That seems to shake him from his reverie. Grumbling, Martin goes about his duty, walking a little more stiffly than you are used to seeing him.'
 		*nl
 		'You cannot outright see the effect of your words, but the telltale hints of it alone somehow make your drink taste better.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 12 and MartinSex = 1 and npc_rel['A216'] >= 70:
 		MartinTalkVar = 13
 		'Martin nods and a few seconds later, a drink sits in front of you.'
@@ -818,7 +818,7 @@ if $ARGS[0] = '':
 		'The warmth in his expression makes you forget about the actor. "Sounds like you and your siblings are close," you note, sharing his smile.'
 		'"Yeah, I guess we are. We don''t talk much, but," he taps his chest, just above the heart, "in here, where it counts, we care about each other. Always have."'
 		*nl
-		
+
 		if mid($start_type,1,2) = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
 			'"Yeah, I know what you mean," you nod, thinking of your own siblings. "No matter where they are, you always know that somebody''s there for you."'
 			'"You have siblings?"'
@@ -848,24 +848,24 @@ if $ARGS[0] = '':
 		'He shrugs, trying to play it down. You can sense that he doesn''t like this topic at all, but he says: "It''s fine. We were four brothers, always getting in trouble together. We were known all over town..."'
 		'Martin falls silent again, and you don''t dare say something. It doesn''t look like he''s trying to find the right words, or like he doesn''t want to continue - he seems lost in thought, as if he had simply forgotten he was talking to you.'
 		*nl
-		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.' 
+		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.'
 		'"Are you okay?" You ask.'
 		'"I''m fine," he assures you, sounding anything but. "Enjoy your drink, mi amor."'
 		*nl
 		'With that, he turns around and, rather than serving patrons, retreats to wash some glasses and check the register, apparently needing some space to pull himself together again.'
 		'Whatever happened to his brothers seems to deeply trouble him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif npc_rel['A216'] < 20:
 		'As usual, Martin brings you your drink of choice. He seems to be in a talkative mood today, though, because he stays with you and strikes up a conversation.'
 		*nl
 		'Mind you, it''s not a very deep one - after your first few attempts at smalltalk, you kinda feel like you have to tiptoe around subjects that may be sensitive, and despite you showing that you are quick on your feet and not one to take an insult lying down, he seems a little unsure about how to talk to you, too.'
 		*nl
 		'Still, you manage to keep it going for a while and by the time another patron wants to order something, you feel like you''ve gotten to know each other a little better, even if you''re still a ways away from becoming best friends.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinSex = 1:
 		pcs_horny += rand(0,1)
 		'As per usual, your favorite barman brings you your drink and, wouldn''t you know it, lingers to spend a little time with you.'
@@ -877,16 +877,16 @@ if $ARGS[0] = '':
 		'Still, as per your unspoken agreement, you are not acting on that while Martin is working behind the bar - the fantasy of giving him a blowjob while he''s pouring drinks has its appeal, but, the huge risk of getting caught aside, Martin has to move around too much for that to be practical.'
 		*nl
 		'So, when one of the regulars calls for Martin, you lick your <<$pc_desc[''lip size'']>> lips lasciviously and thank him for the drink in a low, sexy voice before Martin goes back to work, his walk a little funnier than before.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	else
-		'As always, Martin brings you your beverage of choice. Rather then leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
+		'As always, Martin brings you your beverage of choice. Rather than leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
 		*nl
 		'You keep the conversation light today, talking about how your respective day was, what has been going on in the bar and the area,' + iif($MartinHobby!'',' and, of course, your <<$MartinHobby>>,','') + ' but really, these subjects are little more than a facade for subtle and not-so-subtle quips, hidden and open insults you try to outwit the other with, and the occasional suggestive remark, usually followed by roaring laughter.'
 		*nl
 		'Neither of you finds out anything mindblowing about the other, but you still feel like you and Martin know each other a little better now, your friendship with him growing stronger the more time you spend with him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	end
 end
@@ -894,7 +894,7 @@ end
 if $ARGS[0] = 'MartinTalkHobby':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:' 
+	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:'
 	'A new patron is calling him over, so it looks like this heart-to-heart is coming to an end soon.'
 	*nl
 	'You lean on the counter, giving Martin a coquettish look, as you sometimes do to tease him. "Did that one question already satisfy your curiosity about me?" You ask.'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'MartinTalkHobby':
 end
 
 if $ARGS[0] = 'MartinTalkApartment':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 	if func('homes_properties', 'has_access', 'city_apartment'):
 		'"Actually, I have a small apartment, on the other side of the park."'
 		*nl
@@ -917,7 +917,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"Oh no, I''d never do that," you assure him, your tone still sarcastic.'
 		*nl
 		'From the laughter that follows, the conversation quickly moves away from work and, as per usual, lasts until somebody requires a new drink, leaving you to finish your beverage alone.'
-	
+
 	elseif tanwork = 1:
 		'"I live in the city center, actually."'
 		*nl
@@ -926,7 +926,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'Martin laughs. "Well, you definitely make it sound complicated. Good for you. But," he turns serious once more, "nothing like that is ever truly ''free'', so... be careful."'
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still nod yes at him before he has to get back to work.'
-	
+
 	elseif func('uniutil', 'student', 'enrolled'):
 		'"I have a room in one of the university dormitories, actually. I wouldn''t call it ''living'', though."'
 		*nl
@@ -935,7 +935,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'Martin nods understandingly. "I get it. At least you have a place to live near the center. Though it can get pretty wild there during the weekend, I heard," he comments, "and drunk people can be unpredictable. So, you watch yourself, okay?"'
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
-	
+
 	elseif mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'You sigh. "Yeah, it does. I''ll get an apartment of my own as soon as I can. In the city, I hope."'
 		'"You do that, corazón," Martin says, already a little distracted by a patron waving at him, and just like that, you''re alone with your drink.'
-		
+
 	else
 		'You do not want to talk about your current living situation, though. It''s just too embarrassing to talk to him about it while you''re sitting in his bar, so you have to make something up, and quick.'
 		*nl
@@ -958,7 +958,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"No no, it''s fine," you cut him off with a hint of panic in your voice. Realizing that, you add more calmly: "I''ll be moving out soon, anyway."'
 		'"Okay..." He says slowly, raising an eyebrow. Before he can make any further inquiries, a nearby patron calls for him, saving you from further embarrassment and giving you time to get your story straight, should he ask again.'
 	end
-	
+
 	act 'Finish your drink': gt 'qwBarPolet', 'bar'
 end
 

locations/beta_journal_quests.qsrc

@@ -167,7 +167,6 @@ if $ARGS[0] = 'vcard':
 		$next_nav = 'Current Stage'
 	else
 		$next_nav = '<a href="gs ''<<$loc_id>>'', ''navigation'', ''next'' "" >Next Stage</a> <b>→</b>'
-		gs
 	end
 	if $npc_quest['q_back'] = 'null':
 		$back_nav = 'Quest Start'

locations/body_structure.qsrc

@@ -71,57 +71,57 @@ end
 
 
 if $ARGS[0] = 'body_img_totals':
-	if ARGS[0] = 000:
+	if ARGS[1] = 000:
 		result = 2
-	elseif ARGS[0] = 006:
+	elseif ARGS[1] = 006:
 		result = 2
 
-	elseif ARGS[0] = 100:
+	elseif ARGS[1] = 100:
 		result = 4
-	elseif ARGS[0] = 106:
+	elseif ARGS[1] = 106:
 		result = 3
 
-	elseif ARGS[0] = 200:
+	elseif ARGS[1] = 200:
 		result = 2
-	elseif ARGS[0] = 206:
+	elseif ARGS[1] = 206:
 		result = 4
-	elseif ARGS[0] = 207:
+	elseif ARGS[1] = 207:
 		result = 3
-	elseif ARGS[0] = 208:
+	elseif ARGS[1] = 208:
 		result = 1
-	elseif ARGS[0] = 210:
+	elseif ARGS[1] = 210:
 		result = 1
-	elseif ARGS[0] = 213:
+	elseif ARGS[1] = 213:
 		result = 1
-	elseif ARGS[0] = 215:
+	elseif ARGS[1] = 215:
 		result = 1
 
-	elseif ARGS[0] = 300:
+	elseif ARGS[1] = 300:
 		result = 3
-	elseif ARGS[0] = 306:
+	elseif ARGS[1] = 306:
 		result = 3
-	elseif ARGS[0] = 307:
+	elseif ARGS[1] = 307:
 		result = 1
-	elseif ARGS[0] = 308:
+	elseif ARGS[1] = 308:
 		result = 1
 
-	elseif ARGS[0] = 400:
+	elseif ARGS[1] = 400:
 		result = 2
-	elseif ARGS[0] = 406:
+	elseif ARGS[1] = 406:
 		result = 2
 
-	elseif ARGS[0] = 500:
+	elseif ARGS[1] = 500:
 		result = 3
-	elseif ARGS[0] = 506:
+	elseif ARGS[1] = 506:
 		result = 2
 
-	elseif ARGS[0] = 600:
+	elseif ARGS[1] = 600:
 		result = 1
 
-	elseif ARGS[0] = 700:
+	elseif ARGS[1] = 700:
 		result = 2
 
-	elseif ARGS[0] = 800:
+	elseif ARGS[1] = 800:
 		result = 1
 
 	end

locations/booty_call_sms.qsrc

@@ -491,6 +491,8 @@ if $ARGS[0] = 'new_booty_call':
 							else
 							end
 						end
+					else
+						$SMSTree['b12'] = 'PLACEHOLDER 2'
 					end
 				end
 
@@ -523,17 +525,17 @@ if $ARGS[0] = 'new_booty_call':
 	elseif $npc_rel_type[$ARGS[1]] = 'boyfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = boyfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER3'
 
 	elseif $npc_rel_type[$ARGS[1]] = 'girlfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = girlfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER4'
 
 	else
 		!! temp
 		$SMSTree['10'] = 'PLACEHOLDER3'
-			$SMSTree['11'] = 'PLACEHOLDER4'
+			$SMSTree['11'] = 'PLACEHOLDER5'
 	end
 
 

locations/brother.qsrc

@@ -406,6 +406,7 @@ if $ARGS[0] = 'playfootball':
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 		gs 'exercise', 'tier1', 60, 'agil', 'vital'
 		gs 'exp_gain', 'run', rand(0, 2)
+		if ftball_lvl < 20: gs 'exp_gain', 'ftball', rand(0, 2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'

locations/brother_voyeur.qsrc

@@ -62,11 +62,11 @@ if $ARGS[0] = 'showertalk1':
 		'"You''re not?" he says, looking up at you before blushing at your exposed body and turning away again.'
 		'"Of course not silly! I''m not even mad! I just wanted to catch up with my favorite little brother and I thought, since you were right there, why not now?"'
 		'"Oh, okay..." he nods, still looking away.'
-		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,3)
+		if npc_rel['A34'] <50: gs 'npc_relationship', 'modify', 'A34', 'like'
 
 		if pcs_inhib >= 40 or npc_rel['A34'] >= 90:
 			act'"You can look at me you know"':
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				*clr & cla
 				brothershowerlook = 1
 				if brotherSex < 2:brotherSex = 2
@@ -124,7 +124,7 @@ end
 if $ARGS[0] = 'showertalk2':
 	if npc_QW['A34'] <= 1: npc_QW['A34'] = 2
 	brothershowertalk += 1
-	npc_rel['A34'] += rand(2,3)
+	gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowerlook = 1:gt 'brother_voyeur', 'brothershowerlook'
 	cla & *clr
 	if brothershowerask ! daystart:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'showertalk2':
 	act'Continue':
 		if brothershowerlook >= 1:gt 'brother_voyeur', 'brothershowerlook'
 		*clr & cla
-		if npc_rel['A34'] < 50:npc_rel['A34'] += rand(1,2)
+		if npc_rel['A34'] < 50: gs 'npc_relationship', 'modify', 'A34', 'like'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 		'He slips inside and sits on the toilet again, staring at the wall, though not before "sneaking" a peek at your exposed breasts.'
 		*nl
@@ -154,7 +154,7 @@ if $ARGS[0] = 'showertalk2':
 			*clr & cla
 			brothershowerlook = 1
 			if brotherSex < 2:brotherSex = 2
-			npc_rel['A34'] += 5
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
 
@@ -272,7 +272,7 @@ if $ARGS[0] = 'brothershowerlook':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 	brother_shower['look'] = daystart
 	inhib_exp += rand(1,3)
-	if npc_rel['A34'] <50 and brothershowerask ! daystart:npc_rel['A34'] += rand(1,2)
+	if npc_rel['A34'] <50 and brothershowerask ! daystart: gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowertalk < 10 and brothershowerask ! daystart:
 		'He slips inside and takes his usual place on the toilet along with the traditional quick glance at your breasts. He''s gripping the edge of the seat and leaning forward with an eager smile. If nothing else, he''s certainly happy to be here.'
 	elseif brothershowertalk >= 10 and brothershowerask ! daystart:
@@ -592,7 +592,7 @@ if $ARGS[0] = 'brother_shower_together':
 		if pcs_inhib >= 50 or npc_rel['A34'] > 80:
 			if pcs_horny >= 50:
 				act'Use the showerhead on your pussy':
-					npc_rel['A34'] += 5
+					gs 'npc_relationship', 'modify', 'A34', 'love'
 					cla
 					*nl
 					'"Hey, hand me the showerhead will you?" you say to your brother.'
@@ -630,7 +630,7 @@ if $ARGS[0] = 'brother_shower_together':
 			end
 			act'Give him shower head':
 				cla
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				if brotherbj < 1 and brotherfuck < 1:
 					'"Hey Kolka, want to see something cool?"'
 					'"Huh?" He asks, confused. "What is it?"'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'brother_wash_first':
 end
 
 if $ARGS[0] = 'brother_wash':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	if brotherSex < 4:brotherSex = 4
 	cla & *clr
 	brotherwash += 1
@@ -746,12 +746,13 @@ if $ARGS[0] = 'brother_wash':
 					end
 				end
 			end
+			if pcs_pubes >= shave_trigger:
+				act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
 
-			act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
-
-			act'Just for you':
-				brother_shower['shave_ask1'] = daystart
-				gt 'brother_voyeur', 'brother_shower_shave'
+				act'Just for you':
+					brother_shower['shave_ask1'] = daystart
+					gt 'brother_voyeur', 'brother_shower_shave'
+				end
 			end
 		end
 	end
@@ -806,7 +807,7 @@ if $ARGS[0] = 'shave_both':
 	if mc_inventory['razor'] >= razors_to_use['all']:
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			act 'Shave your legs and pussy (0:15)':
-				npc_rel['A34'] += 3
+				gs 'npc_relationship', 'modify', 'A34', 'like'
 				cla & *clr
 				minut += 15
 				pcs_leghair = 0
@@ -854,7 +855,7 @@ end
 if $ARGS[0] = 'shave_legs':
 	if pcs_leghair > 3 and mc_inventory['razor'] >= razors_to_use['legs']:
 		act 'Shave your legs (0:05)':
-			npc_rel['A34'] += 2
+			gs 'npc_relationship', 'modify', 'A34', 'like'
 			cla & *clr
 			minut += 5
 			pcs_leghair = 0
@@ -956,7 +957,7 @@ if $ARGS[0] = 'shave_legs':
 					end
 
 					act'"Hmm, maybe you''re right" (0:05)':
-						npc_rel['A34'] += 2
+						gs 'npc_relationship', 'modify', 'A34', 'like'
 						cla & *clr
 						pcs_pubes = 0
 						pcs_horny += 5
@@ -996,7 +997,7 @@ end
 if $ARGS[0] = 'shave_pussy':
 	if pcs_pubes > shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
 		act 'Shave your pussy (0:05)':
-			npc_rel['A34'] += 3
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			cla & *clr
 			minut += 5
 			if pubestyle > 0 or pubestyle = 10:
@@ -1170,7 +1171,7 @@ if $ARGS[0] = 'showerfun':
 end
 
 if $ARGS[0] = 'brother_shower_end':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	brother_shower_times += 1
 	if hypnoAddict = 0:
 		cumspclnt = 1

locations/buklinik.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_outdoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'start'
 	minut += 5
 	gs 'stat'
@@ -13,26 +14,28 @@ if $ARGS[0] = 'start':
 	'A well-known homeless shelter in a run-down building. Looking above the entrance you can see a sign saying, Mercy Clinic.'
 	'There is a note by the entrance.'
 	'Working hours: '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+''
-	temp = rand(1, 10)
-	if temp = 9:'A crowd of homeless people have huddled together trying to see if there are any available beds...'
-	if temp = 2:'A homeless person is trying to get into the shelter...'
-	if temp = 3:'An older man is standing outside the shelter...'
-	if temp = 4:'There is a woman standing outside the shelter trying to console her crying child...'
-	if temp = 5:'A bruised woman stands near the entrance having a smoke...'
-	if temp = 1:'A man is walking up and down a path, screaming profanities...'
-	if temp = 8:'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
-	if temp = 7:'A couple are loudly arguing if they want to stay at the shelter tonight...'
-	if temp = 6:'A woman is crying, arguing on the phone, probably with her husband...'
-	if temp = 10:'Surprisingly, there is no one around the shelter...'
 
-	act 'Leave':gt 'city_industrial'
-
-	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
+	temp = rand(0, 9)
+	if temp = 0: 'Surprisingly, there is no one around the shelter...'
+	if temp = 1: 'A man is walking up and down a path, screaming profanities...'
+	if temp = 2: 'A homeless person is trying to get into the shelter...'
+	if temp = 3: 'An older man is standing outside the shelter...'
+	if temp = 4: 'There is a woman standing outside the shelter trying to console her crying child...'
+	if temp = 5: 'A bruised woman stands near the entrance having a smoke...'
+	if temp = 6: 'A woman is crying, arguing on the phone, probably with her husband...'
+	if temp = 7: 'A couple are loudly arguing if they want to stay at the shelter tonight...'
+	if temp = 8: 'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
+	if temp = 9: 'A crowd of homeless people have huddled together trying to see if there are any available beds...'
+
+	act 'Leave': gt 'city_industrial'
+
+	if hour >= 9 and hour < 18: act 'Enter the shelter': gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'holl':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'holl'
 	minut += 5
 	gs 'stat'
@@ -40,7 +43,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'The <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room is locked.'
@@ -68,7 +71,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'As you approach the counter there are two women chatting with each other, and laughing.'
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat, "Hello, my name is <<$pcs_firstname>>, I found a note that you were looking for volunteers..."'
 		'One of the women cheerfully replies, "Welcome to our little humble shelter. As you''ve probably noticed the place is run down and we''re really in need of some volunteers." They point further down the corridor, "What you see here is just a small part of the operation that we provide. We also help out with the elderly and the less fortunate outside the shelter."'

locations/clinic_functions.qsrc

@@ -759,6 +759,4 @@ if $ARGS[0] = 'bImplantB':
 	act 'Continue': gt $loc, $loc_arg
 end
 
-
-
---- clinic_functions ---------------------------------------
+--- clinic_functions ---------------------------------

locations/din_bad.qsrc

@@ -244,7 +244,15 @@ if $ARGS[0] = 'd_bag':
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
 	if mc_inventory['newspaper'] = 1: newspaperVars['dbag'] = 1 & act 'Read your newspaper': gt 'newspaper', 'start'
-
+	act 'Visit the therapist (1:00)': gt 'therapist', 'start'
+	dynamic $bteeth
+	dynamic $tampon
+	dynamic $toymanage
+	dynamic $publicpan
+	gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	dynamic $shower
+	dynamic $bath
+	act 'Choose an outfit': gt 'wardrobe', 'main'
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'
 end

locations/din_van.qsrc

@@ -1054,15 +1054,13 @@ if $ARGS[0] = 'toymanage':
 			minut += 5
 			vibratorIN = 0
 
-			if pcs_vag < 30:pcs_vag += 1
-
 			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/vibrator.jpg"></center>'
 			*nl
 			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif mc_inventory['vibe'] = 1 and vibratorIN = 0 and pcs_vag ! 0:
+	elseif mc_inventory['vibe'] = 1 and vibratorIN = 0 :
 		act 'Insert the vibrator in your vagina (0:05)':
 			menu_off = 1
 			cla
@@ -1070,7 +1068,6 @@ if $ARGS[0] = 'toymanage':
 			minut += 5
 			vibratorIN = 1
 
-			if pcs_vag < 30:pcs_vag += 2
 
 			'<center><img <<$set_imgh>> src="images/pc/items/sextoys/vibrator.jpg"></center>'
 			*nl

locations/fuelstation_carwash.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'titsFlash':
 	else
 		if PCloPants > 0:
 			$flash_video = 'images/locations/shared/carwash/pants/titsflash<<rand(1, 4)>>.mp4'
-		elsei
+		else
 			$flash_video = 'images/locations/shared/carwash/skirt/titsflash<<rand(1, 3)>>.mp4'
 		end
 	end

locations/gad_field.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'field':
 			gs 'stat'
 
 			act 'Continue': gt 'gad_field', 'field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 	end
 

locations/gad_gpbarn.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '':
 			gs'stat'
 
 			act 'Finish': gt 'gad_gpbarn'
-			act 'Return back to your grandfather': minut += 2 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 2 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	gs 'bicycle', 'gad_gpbarn'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'horse':
 			'You watch him eat for a little while before moving on.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_lead_horse_to_field'] = 1:
@@ -169,7 +169,7 @@ if $ARGS[0] = 'horse':
 			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
 			act 'Continue': gt 'gad_field', 'field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 1:
@@ -187,7 +187,7 @@ if $ARGS[0] = 'horse':
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 2:
-		act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+		act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 	end
 	if grandpaQW['chore_brush_horse'] = 1:
 		act 'Groom the horse (1:00)':
@@ -201,7 +201,7 @@ if $ARGS[0] = 'horse':
 			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end
@@ -230,7 +230,7 @@ if $ARGS[0] = 'cow':
 			'You start milking Dawn, improving each time you do it.'
 
 			act 'Finish': gt 'gad_gpbarn', 'cow'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
@@ -245,7 +245,7 @@ if $ARGS[0] = 'cow':
 			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
 			act 'Finish': gt 'gad_gpbarn','cow'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
@@ -263,7 +263,7 @@ if $ARGS[0] = 'cow':
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where your grandfather awaits you. It''s his turn to keep an eye on the cows..'
 
 			act 'Continue': gt 'gad_field', 'cow'
-			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end
@@ -291,7 +291,7 @@ if $ARGS[0] = 'boar':
 			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish': gt 'gad_gpbarn','boar'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end

locations/gad_gphouse.qsrc

@@ -162,6 +162,7 @@ if $ARGS[0] = 'kitchen':
 	act 'Eat a normal meal (0:15)': gs 'food', 'm_meal'
 	act 'Eat a light meal (0:10)': gs 'food', 's_meal'
 
+	gs 'kit_din'
 	dynamic $edasnack
 	dynamic $sandwich
 	dynamic $driwater
@@ -601,6 +602,9 @@ if $ARGS[0] = 'grandpa_leave_event':
 	act 'Leave': minut += 1 & gt $loc, $loc_arg
 end
 
+
+
+
 	!!=============================================================================================!!
 	!!                                                                                             !!
 	!!                                       INACTIVE BACKUP                                       !!

locations/gad_gpyard.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'start':
 			end
 			gs'stat'
 			act 'Finish': gt 'gad_gpyard', 'start'
-			act 'Return back to your grandfather': minut += 1 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 1 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	act 'Enter your grandparents'' house': minut += 1 & gt 'gad_gphouse', 'entry'
@@ -262,12 +262,13 @@ end
 
 if $ARGS[0] = 'chickens':
 	*clr & cla
-	$loc_arg = 'chickens'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
-	'Ordinary chickens clucking about their pen.'
+	menu_off = 1
 	minut += 1
 	gs 'stat'
 
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
+	'Ordinary chickens clucking about their pen.'
+
 	act 'Leave': gt 'gad_gpyard', 'start'
 	!job Granny
 	if grandmaQW['chore_feed_chickens'] = 1:
@@ -281,7 +282,7 @@ if $ARGS[0] = 'chickens':
 			gs 'stat'
 
 			act 'Finish': gt 'gad_gpyard', 'start'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -334,7 +335,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/work_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend some time doing some gardening.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 2 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 2 & gt 'gp_elene', 'talk'
 		end
 	end
 	!job Granny
@@ -353,7 +354,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/water_garden.jpg"></center>'
 			'You spend an hour watering the garden.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 	!job Granny
@@ -372,7 +373,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/harvest_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend a few hours harvesting vegetables in the garden.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -439,7 +440,7 @@ if $ARGS[0] = 'strawberry':
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish': gt 'gad_gpyard', 'strawberry'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -500,7 +501,7 @@ if $ARGS[0] = 'fruit_garden':
 			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
 
 			act 'Finish': gt 'gad_gpyard', 'fruit_garden'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 end

locations/gad_market.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'hunter_stand':
 		exit
 	end
 
-	'<center><img <<$set_imgh>> src="images/location/gadukino/market/hunter_stand.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/hunter_stand.jpg"></center>'
 	'A small stand selling dried meat'
 
 	if hunters_were_met = 1: act 'Talk to one of the hunters': gt 'gad_market', 'hunter_talk'
@@ -85,7 +85,6 @@ if $ARGS[0] = 'hunter_cart':
 	$args_s = 'hunter_cart'
 	gs 'stat'
 
-	$backimage='images/location/gadukino/market/hunter_stand.jpg'
 
 	if hour < 8 or hour > 20:
 		'The shop is currently closed.'
@@ -98,6 +97,8 @@ if $ARGS[0] = 'hunter_cart':
 	gs 'stat'
 	gs 'themes', 'outdoors'
 
+	$backimage='images/locations/gadukino/market/hunter_stand.jpg'
+
 	act 'Exit shopping cart': $backimage = '' & gt 'gad_market', 'hunter_stand'
 	act 'Leave the stand': minut += 1 & gt 'gad_market', 'start'
 end
@@ -108,7 +109,7 @@ if $ARGS[0] = 'clothing_stand':
 	$loc_s = 'gad_market'
 	$args_s = 'clothing_stand'
 
-	'<center><img <<$set_imgh>> src="images/location/gadukino/market/clothing_stand.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/clothing_stand.jpg"></center>'
 	'A small stand selling cheap clothes'
 
 	if hour < 8 or hour > 20:

locations/gad_store.qsrc

@@ -35,7 +35,7 @@ if grandmaQW['chore_groceries'] = 1:
 		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out anymore..."'
 
 		act 'Thank him and leave': minut += 5 & gt 'gadukino'
-		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gad_gphouse', 'grandma'
+		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gp_elene', 'talk'
 	end
 end
 

locations/gdktoilet_mens.qsrc

@@ -576,7 +576,7 @@ if $ARGS[0] = 'mensglory':
 										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
 										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
-										'You pull off him, getting up and looking down at him. That is when you noticed your pussy dripping cum all over his penis. The man unable to move breathing heavily. The man replies, "I thought it felt better then it should''ve been." '
+										'You pull off him, getting up and looking down at him. That is when you noticed your pussy dripping cum all over his penis. The man unable to move breathing heavily. The man replies, "I thought it felt better than it should''ve been." '
 										gs 'cuminsidereact'
 										'He continues to breath heavily and says, "You were great though, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
 										act 'Leave': gt 'gdktoilet', 'start'

locations/gp_elene.qsrc

@@ -1051,4 +1051,4 @@ if $ARGS[0] = 'set_talk_acts':
 end
 
 
---- gp_elene ---------------------------------------------
+--- gp_elene ---------------------------------

locations/gp_zlatek.qsrc

@@ -885,4 +885,4 @@ if $ARGS[0] = 'set_talk_acts':
 end
 
 
---- gp_zlatek ---------------------------------------------
+--- gp_zlatek ---------------------------------

locations/gschool_jock_chats.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'lazar':
 		if npc_rel['A149'] >= 50:
 			'As you approach, several of the other jocks and cool kids start giving you a hard time. Before you can even say a word, he scoffs at you. "Get lost! This isn''t for you." He starts talking to the others as you walk away. At least he wasn''t mean about it.'
 		elseif npc_rel['A149'] <= 20:
-			'"Looks like the loser is lost." someone comments as you approach.' 
+			'"Looks like the loser is lost." someone comments as you approach.'
 			'"Nah, I bet even Lesco and Petia can''t stand being around her and, honestly, who can blame them?" Lazar replies, which gets the group laughing so hard you know it''s pointless to even try and talk to him.'
 		else
 			'You approach and try to talk to him, but he straight up ignores you and pretends you''re not there. After several minutes of this, he finally sighs loudly. "Can''t you take a fucking hint? No one wants to talk to you!" He then returns to ignoring you and you walk away.'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'svyatoslav':
 	elseif grupTipe = 2:
 		if npc_rel['A8'] >= 50:
 			'You walk up to him and start chatting. You talk about working out and staying fit before he starts flirting with you. You get the feeling he has a thing for you, or that he just wants to get in any girl''s panties so he has something to brag about to the other jocks.'
-			func('npc_reactions', 'general', 'A8')   
+			func('npc_reactions', 'general', 'A8')
 		elseif npc_rel['A8'] <= 20:
 			'He gives you a dirty look as you approach. "I''ve got nothing to say to you, so go bother someone else." You try talking to him, but he just gets more annoyed with you, so you finally give up and leave.'
 		else
@@ -301,7 +301,7 @@ if $ARGS[0] = 'erast':
 			'"You know, I''ve been trying to pay more attention to my shape lately and I feel like I''m not getting the results I should, according to my training plan," you explain as you get your plan out of your pocket and show it to him.'
 			'"It''s not a horse race," he quickly replies. "People usually think they get the required result within weeks when it actually needs months, even years sometimes."'
 			*nl
-			'"Years?" you ask in despair before asking if he could explain some things to you.' 
+			'"Years?" you ask in despair before asking if he could explain some things to you.'
 			'He looks around, as if looking for someone to talk to instead, before he sighs and starts to talk about nutrition, metabolism, resting, bulking, calisthenics, and everything that can affect your progress.'
 			'You don''t understand everything he says, but are happy that he''s willing to share some of his knowledge. After talking about it for a few minutes, you feel you might have learned something.'
 			func('npc_reactions', 'general', 'A150')
@@ -327,7 +327,7 @@ if $ARGS[0] = 'erast':
 			'By the skin of his teeth, he shares his knowledge but doesn''t let you interrupt him with your questions. You get the feeling that he only helps you because he is polite and you are a fellow jock.'
 			func('npc_reactions', 'general', 'A150')
 			'When the bell rings, he seems a bit relieved.'
-			'"Thanks Erast," you say while grabbing your things and you both go your own ways.'			
+			'"Thanks Erast," you say while grabbing your things and you both go your own ways.'
 		else
 			'"Hi Erast, what''s that?" you ask when you see he is completely immersed in his notes.'
 			'"Oh, hello <<$pcs_nickname>>. Sorry I didn''t notice you," he replies. "I''m trying to improve my training plan and make it more varied," he says and shows you his notes.'
@@ -431,7 +431,7 @@ if $ARGS[0] = 'christina':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if NatbelQW['chrispaid'] = 2 and money >= 500:
 		act 'Pay off Natasha''s debt (500 <b>₽</b>)':
-			*clr & cla		
+			*clr & cla
 			money -= 500
 			NatbelQW['chrispaid'] = 3
 			NatbelQW['evt_day'] = daystart
@@ -445,7 +445,7 @@ if $ARGS[0] = 'christina':
 			'She snatches the money from your hand. "What, was she too scared to speak to me? She had to get you to do it for her?"'
 			'"Something like that," you reply. "Anyway, don''t lend her any more money."'
 			'"Wasn''t planning to. It took her long enough to pay this back!" She counts out the money and a slight smile crosses her face. "Alright, we''re done here. You can leave now."'
-			
+
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif christinaQW['subpath'] >= 2:
@@ -496,7 +496,7 @@ if $ARGS[0] = 'christina':
 		'Seeing you walking towards her, she tenses up and whispers "What do you need?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Uh, hi. Well, I gotta go, class is starting." Grabbing her stuff, she flees from your sight. Chuckling to yourself, you do the same.'
-	else 
+	else
 		if fame['pav_slut'] >= 200:
 			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina asks mockingly.'
 			'"Shut up Christina! I''m tired of your bullshit," you tiredly reply.'
@@ -554,7 +554,7 @@ if $ARGS[0] = 'christina':
 			$temp['tampon_ask'] = '"My... my period started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"My... my period started and I don''t have a pad. Can I borrow one?"'
@@ -566,7 +566,7 @@ if $ARGS[0] = 'christina':
 			$temp['tampon_ask'] = '"My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"My period is starting soon and I don''t have a pad. Can I borrow one?"'
@@ -618,8 +618,8 @@ if $ARGS[0] = 'albina':
 			if rand(1,2) = 1:
 				'You approach Albina and she gives you a small smile. "Hey <<$pcs_nickname>>, how are you enjoying the Starlets?" You open your mouth to answer, but she cuts you off before you can speak. "Just keep coming to dance practice, okay?" She gives you another small smile before walking away.'
 			else
-				'You approach Albina, who is lost in her thoughts. "Oh hey <<$pcs_nickname>>..." she says glumly when she notices you.' 
-				'"Is everything okay? Something on your mind?" you ask concerned.' 
+				'You approach Albina, who is lost in her thoughts. "Oh hey <<$pcs_nickname>>..." she says glumly when she notices you.'
+				'"Is everything okay? Something on your mind?" you ask concerned.'
 				'She sighs in response. "Yeah, it''s... it''s nothing. Just keep coming to dance practice, okay?" She gives you a weak smile before walking away, lost in her thoughts again.'
 			end
 		elseif AlbinaQW['Friends'] = 1:
@@ -742,7 +742,7 @@ if $ARGS[0] = 'albina':
 			$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'albina':
 			$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
@@ -944,7 +944,7 @@ if $ARGS[0] = 'veronika':
 			$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
@@ -956,7 +956,7 @@ if $ARGS[0] = 'veronika':
 			$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'lina':
 			'"I wasn''t paying attention to the teacher because Christina was texting me. She wants to know what I''m wearing to the dance this weekend."'
 			'"Why does that matter?" you ask.'
 			'"I don''t know. Maybe she wants us to match or something?" she replies, looking a little confused.'
-			$OpenInnerThought+'Yeah right. She probably wanted to make sure she''s wearing something better then Lina.'+$CloseInnerThought
+			$OpenInnerThought+'Yeah right. She probably wanted to make sure she''s wearing something better than Lina.'+$CloseInnerThought
 			'You walk away, leaving Lina looking all dreamy-eyed thinking about her and Christina wearing the same clothes. She probably didn''t even see you leaving.'
 		elseif npc_rel['A19'] <= 20:
 			'"Unless you''re here to do my homework, get lost nerd."'
@@ -1137,20 +1137,20 @@ if $ARGS[0] = 'lina':
 		elseif npc_rel['A19'] <= 20:
 			'"So, where''s the old ball and chain?" you ask teasingly.'
 			'"Oh shut up, <<$pcs_nickname>>! Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people..." she fires back.'
-		else	
+		else
 			'Lina sees you walking over to her and looks uncomfortable.'
 			'"How are you, Lina?" you ask while giving her your best smile.'
 			'"I''m sorry, but I can''t be seen talking to you."'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	
+
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
 				$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'lina':
 			$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
@@ -1175,7 +1175,7 @@ end
 if $ARGS[0] = 'lina_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
-	
+
 	if $temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A19'] >= 70:
 			'She looks around before quickly digging through her backpack for a tampon. "Here."'
@@ -1229,7 +1229,7 @@ if $ARGS[0] = 'lariska':
 				'"I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be..."'
 				'"Then why were you there?" you ask her teasingly, pretty sure you already know the answer.'
 				'Her face turns bright red. "I-I...Uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
-				'"Relax," you say laughing. "I beat the shit out of her, so she knows better then to deny me something I want. Just ask her about it the next time you get a chance, okay?"'
+				'"Relax," you say laughing. "I beat the shit out of her, so she knows better than to deny me something I want. Just ask her about it the next time you get a chance, okay?"'
 				'She looks at you, a bit dazed, but manages to nod.'
 				'Giving her a soft smile, you head off to your next class.'
 			elseif christinaQW['blackmail'] >= 2 or christinaQW['subpath'] >= 2:
@@ -1395,7 +1395,7 @@ if $ARGS[0] = 'lariska':
 				'"So where''s the old ball and chain?" you ask teasingly.'
 				'"Oh shut up, <<$pcs_nickname>>! Don''t you have anything better to do? At least I have friends!" she fires back.'
 				'You start laughing. "Yeah, <i>friends</i>." Rolling your eyes at her, you walk away.'
-			else	
+			else
 				'"What are you doing here, <<$pcs_nickname>>? You don''t have friends here."'
 				'"Just because I''m not in your little social club doesn''t mean I don''t have friends."'
 				'"That''s exactly what that means. If you actually tried to get along with people, maybe they would start accepting you."'
@@ -1409,7 +1409,7 @@ if $ARGS[0] = 'lariska':
 			$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
@@ -1421,7 +1421,7 @@ if $ARGS[0] = 'lariska':
 			$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
@@ -1434,7 +1434,7 @@ end
 if $ARGS[0] = 'lariska_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
-	
+
 	if $temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A13'] >= 70:
 			'She looks around before quickly digging through her backpack for a tampon and discreetly passes it to you. "Here."'

locations/hotel_anna_sex.qsrc

@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'librarian_brat_end':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
-			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"...A-anna...go easy..."</font> The session doesn''t last long; Anna slap your butt for less then two minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. You got a delicate skin... . Anyway, we''ve done, and those few slaps should help you improve your performance; come see me when you finish dress your self... ." </font>'
+			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"...A-anna...go easy..."</font> The session doesn''t last long; Anna slap your butt for less than two minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. You got a delicate skin... . Anyway, we''ve done, and those few slaps should help you improve your performance; come see me when you finish dress your self... ." </font>'
 			act '...': gt 'hotel_anna_sex', 'librarian_end'
 		end
 	elseif Anna_librarian_brat = 2 or Anna_librarian_brat = 3:
@@ -1058,7 +1058,7 @@ if $ARGS[0] = 'librarian_brat_end':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
-			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"..."</font> Anna spank your butt for less then a couple of minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. Let see... . That''s was a little warm up <<$pcs_nickname>>...you earned two strokes." </font><br><font color = #DC143C>"...But...but..."</font><font color = blue> "Don''t be a childish...move move. Put your hands on the chair and bend over." </font>'
+			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"..."</font> Anna spank your butt for less than a couple of minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. Let see... . That''s was a little warm up <<$pcs_nickname>>...you earned two strokes." </font><br><font color = #DC143C>"...But...but..."</font><font color = blue> "Don''t be a childish...move move. Put your hands on the chair and bend over." </font>'
 			act'Bend over': 
 				*clr & cla
 				gs 'stat'

locations/ilyroom.qsrc

@@ -34,7 +34,7 @@ if $start_type[1] ! 'nomagic':
 				cls
 				gs 'stat'
 				!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-				'You run at Ilyushkin, attempting to kick him while he reloads the gun. Ilyushkin suddenly jumps back into a bedroom and slams the door in your face. Your inertia carries you into the solid interior door, and you rebound off of it just as another shot explodes through it, splintering the wood and narrowly missing hitting you. As you push yourself up from the floor, you see Gustav. The black designs swirling all over his exposed skin, he growls low and dangerous in his chest, and you see the bullet wounds expelling the bullets from his body and closing right before your eyes. His body almost totally black now with the magical tattoos, you see horns sprout from his forehead. Gustav shouts furiously, "NOW YOU DIE!" and charges at the wooden door that Ilyushkin is hiding behind. Lowering his head and shoulders for the impact, he doesn''t even slow as he crashes through the solid wood, sending splinters and shards flying inward into the room. You follow close behind, entering the room and skidding to a halt. Ilyushkin has been thrown backwards and to the ground. He''s bleeding badly from several areas with many wooden spikes impaling his body in various parts. No sign of his gun, he must have dropped it when the door exploded on him. Gustav, still in a rage, falls upon the prone body and, with an inhuman roar, begins to pummel the unconscious man. Small lightning bolts arc through Ilyushkin as Gustav continues to pound his body, quickly reducing him to little more then pulp.'
+				'You run at Ilyushkin, attempting to kick him while he reloads the gun. Ilyushkin suddenly jumps back into a bedroom and slams the door in your face. Your inertia carries you into the solid interior door, and you rebound off of it just as another shot explodes through it, splintering the wood and narrowly missing hitting you. As you push yourself up from the floor, you see Gustav. The black designs swirling all over his exposed skin, he growls low and dangerous in his chest, and you see the bullet wounds expelling the bullets from his body and closing right before your eyes. His body almost totally black now with the magical tattoos, you see horns sprout from his forehead. Gustav shouts furiously, "NOW YOU DIE!" and charges at the wooden door that Ilyushkin is hiding behind. Lowering his head and shoulders for the impact, he doesn''t even slow as he crashes through the solid wood, sending splinters and shards flying inward into the room. You follow close behind, entering the room and skidding to a halt. Ilyushkin has been thrown backwards and to the ground. He''s bleeding badly from several areas with many wooden spikes impaling his body in various parts. No sign of his gun, he must have dropped it when the door exploded on him. Gustav, still in a rage, falls upon the prone body and, with an inhuman roar, begins to pummel the unconscious man. Small lightning bolts arc through Ilyushkin as Gustav continues to pound his body, quickly reducing him to little more than pulp.'
 
 				act 'Run':
 					cls
@@ -186,7 +186,7 @@ if $start_type[1] ! 'nomagic':
 													act 'Get on your knees':
 														cls
 														minut += 5
-														
+
 														cumface += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/shared/sex/group/cum/threesome6.jpg"></center>'
@@ -327,7 +327,7 @@ else
 													act 'Get on your knees':
 														cls
 														minut += 5
-														
+
 														cumface += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/shared/sex/group/cum/threesome6.jpg"></center>'

locations/item_stock_db.qsrc

@@ -1038,7 +1038,7 @@ if $ARGS[0] = 'mothershop':
 
 	item_idx = 4
 	$item_curr_aisle['<<item_idx>>'] = 'Pregnancy Pillow'
-	$var_curr_aisle['<<item_idx>>'] = 'meds_morning_sick'
+	$var_curr_aisle['<<item_idx>>'] = 'preg_pillow'
 	$desc_curr_aisle['<<item_idx>>'] = ''
 	quantity_curr_aisle['<<item_idx>>'] = 1
 	max_curr_aisle['<<item_idx>>'] = 1

locations/kiosk.qsrc

@@ -11,9 +11,9 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/kiosk/kiosk21.jpg"></center>'
 		'It is currently very busy and looks like you''ll have to wait to get to the counter.'
-		
+
 		act 'Leave': minut += 1 & gt $loc
-		
+
 		act 'Wait in line (20 Minutes)': minut += 20 & gt 'kiosk', 'counter'
 
 		if exhibitionist_lvl > 1:
@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'full', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'pussy', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'tits', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 
 					gs 'arousal', 'bj', 10, 'sub'
 					gs 'stat'
-					
+
 					act 'Cum on your face':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/cumface' + rand(1,23) + '.jpg"></center>'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'start':
 
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Go to the counter': gt 'kiosk', 'counter'
 					end
 
@@ -84,17 +84,17 @@ if $ARGS[0] = 'start':
 
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Go to the counter': gt 'kiosk', 'counter'
 					end
 				else
 					*clr & cla
-					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'	
+					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'
 					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the kiosk and spend 2 hours curled up in a ball.'
 					minut += 120
 					gs 'pain', 4, 'tummy', 'hit'
 					gs 'stat'
-					
+
 					act 'Recover':gt $loc
 				end
 			end
@@ -117,10 +117,10 @@ if $ARGS[0] = 'counter':
 	gs 'item_cart', 'shoppping_aisle', 'kiosk'
 	gs 'stat'
 	gs 'themes', 'outdoors'
-	
+
 	$backimage='images/locations/city/shared/kiosk/kiosk123.jpg'
 	act 'Leave':minut += 1 & gt $loc
-	
+
 	if money < 100:
 		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some snack.</TD></TR></table></center>'
 	else
@@ -191,7 +191,7 @@ if $ARGS[0] = 'counter':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You buy the daily newspaper</TD></TR></table></center>'
+			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You buy the weekly newspaper</TD></TR></table></center>'
 			act 'return': gt 'kiosk', 'start'
 		end
 	end
@@ -202,11 +202,11 @@ end
 if $ARGS[0] =  'themes':
 	*clr & cla
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/kiosk/kiosk123.jpg"></center>'
 	'<center><img WIDTH = 245 HEIGHT = 56 src="images/locations/city/shared/kiosk/ruch.jpg"></center>'
 	'All themes cost 500 <b>₽</b>'
-	
+
 	if money >= 500:
 		i = 1
 		:phonethemeloop

locations/kit_din.qsrc

@@ -28,7 +28,7 @@ $santehnikend3 = {
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Get up':gt $curloc
+	act 'Get up': gt $loc, $loc_arg
 }
 
 $santehnikend1 = {
@@ -90,7 +90,7 @@ $santehnikend2 = {
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 	'You offer to issue the plumber a reciept of debt. He thinks for a moment and says, "Okay. Write a receipt. Next time I''m about, I''ll look in and you give me the money. <<$textsan>> Then teking a pen and paper you write the plumber a receipt that you owe him 1,500 <b>₽</b>. Grisha takes the paper and puts it in his pocket. "If you have another leak, call me, here''s my card."'
 
-	act 'Plumber leaves':gt $curloc
+	act 'Plumber leaves': gt $loc, $loc_arg
 }
 
 $santehnikend = {
@@ -104,7 +104,7 @@ $santehnikend = {
 	if money >= 1500:
 		act 'Pay':
 			money -= 1500
-			gt $curloc
+			gt $loc, $loc_arg
 		end
 	elseif money < 1500:
 		'You do not have enough cash on you.'
@@ -122,7 +122,7 @@ $santehnikend = {
 				end
 				killvar 'temp_amount'
 				killvar 'temp_debt'
-				gt $curloc
+				gt $loc, $loc_arg
 			end
 		elseif money + stolmoney + karta >= 1500:
 			'You know that even with your stash in the apartment you are short, but you could get the extra from the ATM.'
@@ -144,7 +144,7 @@ $santehnikend = {
 				killvar 'temp_amount'
 				killvar 'temp_debt'
 
-				gt $curloc
+				gt $loc, $loc_arg
 			end
 		else
 			act 'I did not have enough money':
@@ -168,7 +168,7 @@ $santehnikend = {
 
 				act 'Continue':
 ! here I need work around the direct return address and get from kuhr korr and from kuhr2x korr2x
-					$sexloc = 'korr' + $mid($curloc,5,2)
+					$sexloc = 'korr' + $mid($loc, 5, 2)
 
 					if pcs_apprnc < 60:
 						*clr & cla

locations/library_functions.qsrc

@@ -152,7 +152,14 @@ if $ARGS[0] = 'set_home_read_acts':
 			'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
 		end
 
-		if mc_inventory['fantasy_books'] <= 0 and BookVars['fantasy_pages'] <= 0 and mc_inventory['romance_books'] = 0 and BookVars['romance_pages'] = 0 and artem_borrowed_book = 0 and BookVars['artem_pages'] <= 0:'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
+		if mc_inventory['adventure_books'] <= 0 and BookVars['adventure_pages'] <= 0 and _
+				mc_inventory['fantasy_books'] <= 0 and BookVars['fantasy_books'] <= 0 and _
+				mc_inventory['romance_books'] <= 0 and BookVars['romance_pages'] <= 0 and _
+				mc_inventory['science_books'] <= 0 and BookVars['science_pages'] <= 0 and _
+				mc_inventory['scifi_books'] <= 0 and BookVars['scifi_pages'] <= 0 and _
+				artem_borrowed_book <= 0 and BookVars['artem_pages'] <= 0:
+			'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
+		end
 
 		if mc_inventory['science_books'] > 0:
 			if BookVars['science_pages'] <= 0:
@@ -225,7 +232,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (70 + rand(0, 40) + pcs_traits['nerd_status'] * 10)
 				BookVars['science_pages'] -= temp_pages_read
-				if BookVars['science_pages'] = 0: totalbook += 1
+				if BookVars['science_pages'] <= 0:
+					BookVars['science_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a science book': lib_book_read = 2
+				end
 
 				gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 				gs 'library_functions', 'read_book'
@@ -246,7 +257,7 @@ if $ARGS[0] = 'set_home_read_acts':
 					if pcs_stren > 1:stren_deg -= 1
 					if pcs_vital > 5:vital_deg -= 1
 
-					if BookVars['science_pages'] = 0:
+					if BookVars['science_pages'] <= 0:
 						'You read the final chapters of the science book, completely immersed in the conclusions the authors make.'
 					else
 						'For an hour you enthusiastically read the book, completely immersed in absorbing the knowledge within. By the end you''ve read <<temp_pages_read>> pages.'
@@ -254,8 +265,8 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['science_pages'] = 0:
-						'You read the final chapters of the adventure novel.'
+					if BookVars['science_pages'] <= 0:
+						'You read the final chapters of the science book.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
 					end
@@ -271,8 +282,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['adventure_pages'] -= temp_pages_read
-				if BookVars['adventure_pages'] = 0: totalbook += 1
-
+				if BookVars['adventure_pages'] <= 0:
+					BookVars['adventure_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'an adventure novel': lib_book_read = 2
+				end
 				gs 'library_functions', 'read_book'
 				gs 'stat'
 
@@ -288,10 +302,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 10
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['adventure_pages'] = 0:
+					if BookVars['adventure_pages'] <= 0:
 						'You read the final chapters of the adventure novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -299,7 +313,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['adventure_pages'] = 0:
+					if BookVars['adventure_pages'] <= 0:
 						'You read the final chapters of the adventure novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -317,6 +331,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['fantasy_pages'] -= temp_pages_read
 				if BookVars['fantasy_pages'] <= 0:
+					BookVars['fantasy_pages'] = 0
 					totalbook += 1
 					if lib_book_read = 1 and $lib_book_loaned = 'a fantasy novel': lib_book_read = 2
 				end
@@ -338,7 +353,7 @@ if $ARGS[0] = 'set_home_read_acts':
 					if pcs_stren > 1: stren_deg -= 1
 					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['fantasy_pages'] = 0:
+					if BookVars['fantasy_pages'] <= 0:
 						'You read the final chapters of the fantasy novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -346,7 +361,7 @@ if $ARGS[0] = 'set_home_read_acts':
 
 				else
 					pcs_mood += 10
-					if BookVars['fantasy_pages'] = 0:
+					if BookVars['fantasy_pages'] <= 0:
 						'You read the final chapters of the fantasy novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -363,7 +378,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['scifi_pages'] -= temp_pages_read
-				if BookVars['scifi_pages'] = 0: totalbook += 1
+				if BookVars['scifi_pages'] <= 0:
+					BookVars['scifi_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a science fiction novel': lib_book_read = 2
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -380,10 +399,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 10
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['scifi_pages'] = 0:
+					if BookVars['scifi_pages'] <= 0:
 						'You read the final chapters of the science fiction novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -391,7 +410,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['scifi_pages'] = 0:
+					if BookVars['scifi_pages'] <= 0:
 						'You read the final chapters of the science fiction novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -408,7 +427,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['romance_pages'] -= temp_pages_read
-				if BookVars['romance_pages'] = 0: totalbook += 1
+				if BookVars['romance_pages'] <= 0:
+					BookVars['romance_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a romance novel': lib_book_read = 2
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -425,10 +448,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 20
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the romance novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -436,7 +459,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 10
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the romance novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -455,7 +478,10 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['artem_pages'] -= temp_pages_read
-				if BookVars['artem_pages'] = 0: totalbook += 1
+				if BookVars['artem_pages'] <= 0:
+					BookVars['artem_pages'] = 0
+					totalbook += 1
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -471,17 +497,17 @@ if $ARGS[0] = 'set_home_read_acts':
 				if pcs_nerd > 0:
 					pcs_mood = 100
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['artem_pages'] = 0:
+					if BookVars['artem_pages'] <= 0:
 						'You read the final chapters of the book, completely immersed in the climactic ending to the authors entralling story'
 					else
 						'For an hour you enthusiastically read the book, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
 					end
 				else
 					pcs_mood += 10
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the book.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -490,7 +516,6 @@ if $ARGS[0] = 'set_home_read_acts':
 
 				act 'Close the book': gt $loc, $loc_arg
 			end
-
 		end
 
 		if tractatus > 0:

locations/lover.qsrc

@@ -8,8 +8,10 @@ if $ARGS[0] = 'add':
 		gs 'npcStat', $ARGS[1]
 	end
 
-	$lover[] = $npcID
-	gs 'telefon', 'AddContact', $npcID, $npc_icon[$npcID], 0
+	if arrpos('$lover', $npcID) < 0:
+		$lover[] = $npcID
+		gs 'telefon', 'AddContact', $npcID, $npc_icon[$npcID], 0
+	end
 end
 
 if $ARGS[0] = 'remove':
@@ -25,14 +27,14 @@ end
 
 if $ARGS[0] = 'add_boyfriend':
 	gs 'lover', 'add', $ARGS[1]
-	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "hour > 6 and hour < 20", "", "0"
+	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$npcID>>'", "npc_meetday['<<$npcID>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 	$npc_rel_type[$npcID] = 'boyfriend'
 	stat['boyfriends_current'] += 1
 	stat['total_lovers_current'] += 1
 
 elseif $ARGS[0] = 'add_girlfriend':
 	gs 'lover', 'add', $ARGS[1]
-	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "hour > 6 and hour < 20", "", "0"
+	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$npcID>>'", "npc_meetday['<<$npcID>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 	$npc_rel_type[$npcID] = 'girlfriend'
 	stat['girlfriends_current'] += 1
 	stat['total_lovers_current'] += 1
@@ -80,6 +82,11 @@ end
 
 ! $ARGS[1+]: npc_rel_types that you want to include
 if $ARGS[0] = 'draw_random_from':
+	if $ARGS[1] = 'all':
+		$result = $lover[rand(0, arrsize('$lover')-1)]
+		exit
+	end
+
 	lover_i = 0
 	lover_max_i = arrsize('$lover')
 	:draw_from_lover_loop

locations/lover_call.qsrc

@@ -8,9 +8,9 @@ if $ARGS[0] = 'scheduler':
 			$temp_npcid = $lover[ts_temp_i]
 			if $npc_rel_type[$temp_npcid] = 'boyfriend' or $npc_rel_type[$temp_npcid] = 'girlfriend':
 				if rand(0, 1) = 1:
-					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "totminut > <<totminut + (9 - hour) * 24 + rand(0, 600) - minut>>"
+					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "totminut > <<totminut + (9 - hour) * 24 + rand(0, 600) - minut>>"
 				else
-					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "", "0"
+					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 				end
 			end
 			ts_temp_i += 1
@@ -408,7 +408,7 @@ if $ARGS[0] = 'lover':
 	Call4Date['lover_days'] = daystart - npc_eventday[$Call4Date["NPC"]]
 	gs 'stat'
 	gs 'telefon', 'phone_call_receive'
-	gs 'telefon', 'SetCallSchedule', $Call4Date["NPC"], "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "", "0"
+	gs 'telefon', 'SetCallSchedule', $Call4Date["NPC"], "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 
 
 	if npc_gender[$ARGS[1]] = 0 or npc_gender[$ARGS[1]] = 3:
@@ -936,4 +936,4 @@ if $ARGS[0] = 'NPCCallsForDate':
 end
 
 
---- lover_call ----------------------------------
+--- lover_call ---------------------------------

locations/lover_change.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'Hair':
 			minut += 20
 			gs 'stat'
 
-			'In less then half an hour you see that your hair''s original color has been changed to <<$hairPref>>.'
+			'In less than half an hour you see that your hair''s original color has been changed to <<$hairPref>>.'
 			act 'Get up from chair and go to your <<$npcrelat>>.':
 				cla
 				'You walk towards your <<$npcrelat>> with your new <<$hairPref>> hair and <<$Xe>> tells you that you look amazing.'
@@ -220,35 +220,35 @@ if $ARGS[0] = 'Pier':
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist takes a look at your unpierced ears, and with a quick sharp pain, pierces them.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/c1.jpg"></center>'
-									gs 'piercing_management', 'add', 'ears', '1'
+									gs 'piercing_management', 'add', 'ears', 1
 									gs 'pain', 7, 'ears', 'pierce'
 								end
 							elseif randchan = 1 and pcs_piercings['tongue'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'He asks you to stick out your tongue. You comply and then start to regret it as he pierces your tongue.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/a1.jpg"></center>'
-									gs 'piercing_management', 'add', 'tongue', '1'
+									gs 'piercing_management', 'add', 'tongue', 1
 									gs 'pain', 7, 'tongue', 'pierce'
 								end
 							elseif randchan = 2 and pcs_piercings['lip'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist gently holds your lip as he drives the needle through to pierce it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/b1.jpg"></center>'
-									gs 'piercing_management', 'add', 'lip', '1'
+									gs 'piercing_management', 'add', 'lip', 1
 									gs 'pain', 7, 'lips', 'pierce'
 								end
 							elseif randchan = 3 and pcs_piercings['nose'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'You feel a sharp pain in your nose as he pierces your nose.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/d1.jpg"></center>'
-									gs 'piercing_management', 'add', 'nose', '1'
+									gs 'piercing_management', 'add', 'nose', 1
 									gs 'pain', 7, 'nose', 'pierce'
 								end
 							elseif randchan = 4 and pcs_piercings['brow'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist moves to above your eyes and quickly pierces your eyebrow.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/e1.jpg"></center>'
-									gs 'piercing_management', 'add', 'brow', '1'
+									gs 'piercing_management', 'add', 'brow', 1
 									gs 'pain', 7, 'eyebrows', 'pierce'
 								end
 							elseif randchan = 5 and pcs_piercings['navel'] = 0:
@@ -256,7 +256,7 @@ if $ARGS[0] = 'Pier':
 									'He positions himself to pierce your belly button. You feel a sharp pain through your navel as he pierces it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/n1.jpg"></center>'
 									pcs_horny += 2
-									gs 'piercing_management', 'add', 'navel', '1'
+									gs 'piercing_management', 'add', 'navel', 1
 									gs 'pain', 7, 'tummy', 'pierce'
 								end
 							elseif randchan = 6 and pcs_piercings['nipples'] = 0:
@@ -264,7 +264,7 @@ if $ARGS[0] = 'Pier':
 									'He motions for you to lift up your shirt. After you do the man grabs your breasts rather softly and carefully pierces each nipple.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 									pcs_horny += 5
-									gs 'piercing_management', 'add', 'nipples', '1'
+									gs 'piercing_management', 'add', 'nipples', 1
 									gs 'pain', 7, 'nipples', 'pierce'
 								end
 							elseif randchan = 7 and pcs_piercings['pussy'] = 0:
@@ -273,7 +273,7 @@ if $ARGS[0] = 'Pier':
 									'You cover your mouth as you let out a quick "Eep!", as you feel a quick pain through your labia, but in a second, it''s over.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 									pcs_horny += 7
-									gs 'piercing_management', 'add', 'pussy', '1'
+									gs 'piercing_management', 'add', 'pussy', 1
 									gs 'pain', 7, 'pubic', 'pierce'
 								end
 							elseif pcs_piercings['total'] < pierPrefTmpMin:
@@ -773,7 +773,7 @@ if $ARGS[0] = 'Lips':
 					'As you go back towards <<$Xem>>, <<$Xe>> looks you up and down.'
 					'"There we go!", <<$Xe>> says with a smile.'
 					if lipsPrefTmp = 1:
-						'You can tell <<$Xe>> loves girls with more modest yet full lips, and you have to admit, it''s better then having big whorish, cocksucking lips.'
+						'You can tell <<$Xe>> loves girls with more modest yet full lips, and you have to admit, it''s better than having big whorish, cocksucking lips.'
 					elseif lipsPrefTmp = 2:
 						'You can tell that <<$npcdesc>> likes a girl to have whorish, cocksucking lips, and as you give the mirror in the room a quick slutty face, you have to admit it does make you look sexier.'
 					end
@@ -861,7 +861,7 @@ if $ARGS[0] = 'Tits':
 							if titBoy = 0:
 								'If you are getting inplants this should not fire off.'
 							elseif titBoy = 1:
-								'You can tell that <<$npcdesc>> likes a girl with a good rack, thankfully although you look more like a bimbo then before, <<$Xyr>> tit preference is not outragously big, and you must admit, it does make you look sexier.'
+								'You can tell that <<$npcdesc>> likes a girl with a good rack, thankfully although you look more like a bimbo  than  before, <<$Xyr>> tit preference is not outragously big, and you must admit, it does make you look sexier.'
 							elseif titBoy = 2:
 								'You can clearly tell <<$npcdesc>> loves a girl with bimbo-sized tits, as you hold your tits you look at yourself in the mirror. The girl staring back at you looks like a bimbo that doesn''t know where to put her whorish tits. And you have to admit, it does turn you on a little.'
 							end

locations/lover_living.qsrc

@@ -438,7 +438,4 @@ if $ARGS[0] = 'santehnik':
 	end
 end
 
-
-
-
---- lover_living ----------------------------------
+--- lover_living ---------------------------------

locations/lover_meet.qsrc

@@ -285,7 +285,7 @@ if $ARGS[0] = 'start':
 					end
 				elseif (cumloc[6] = 1 or cumloc[7] = 1):
 					if npc_gentle[$npcID] = 1:
-						npc_rel[$npcID] += 2=1
+						npc_rel[$npcID] += 1
 						pcs_horny += 5
 						'<<$Xec>> can see sperm on your ass, but underneath <<$Xyr>> shy demener you know that it only turns <<$Xem>> on.'
 					elseif npc_rough[$npcID] = 0:

locations/lover_pref.qsrc

@@ -285,7 +285,7 @@ if $ARGS[0] = 'check_piercings':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -340,7 +340,7 @@ if $ARGS[0] = 'check_tattoos':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -369,7 +369,7 @@ if $ARGS[0] = 'check_makeup':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -404,7 +404,7 @@ if $ARGS[0] = 'check_haircol':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'check_tits':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -480,7 +480,7 @@ if $ARGS[0] = 'check_lips':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -519,7 +519,7 @@ if $ARGS[0] = 'check_bmi':
 		lp_temp_check = 0
 		result = 1
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end

locations/metro.qsrc

@@ -101,7 +101,6 @@ if $ARGS[0] = 'start':
 	end
 
 	if pusher = 1 and dealer = 0:
-		dealer = 1
 		'You see a tall, emaciated man leaning against the wall next to the tracks, looking very shady. He notices you looking and beckons you to come closer.'
 		act 'Talk to the man':gt 'metro', 'dealer'
 	elseif dealer ! 0:
@@ -209,6 +208,7 @@ end
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
+	dealer = 1
 	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."'
 	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.'
 	'He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'

locations/npcStat.qsrc

@@ -457,7 +457,7 @@ if $ARGS[1] ! '' and npcStat_i > 0:
 		$dick_class<<npcStat_i>>		= $npcStatVars['dick_class']
 		$dick_desc<<npcStat_i>>			= $npcStatVars['dick_desc']
 		$dick_desc_pref<<npcStat_i>>	= $npcStatVars['dick_desc_pref']
-		silavag<<npcStat_i>>			=  npcStatVars['sexskill']
+		silavag<<npcStat_i>>			=  npcStatVars['sexskill'] / 50
 		npcAge<<npcStat_i>>				=  npcStatVars['age']
 		$npcHair<<npcStat_i>>			= $npcStatVars['hair']
 		$npcClo<<npcStat_i>>			= $npcStatVars['outfit']
@@ -500,7 +500,7 @@ else
 	$dick_class[npcStat_i]		= $npcStatVars['dick_class']
 	$dick_desc[npcStat_i]		= $npcStatVars['dick_desc']
 	$dick_desc_pref[npcStat_i]	= $npcStatVars['dick_desc_pref']
-	silavag[npcStat_i]			=  npcStatVars['sexskill']
+	silavag[npcStat_i]			=  npcStatVars['sexskill'] / 50
 	 npcAge[npcStat_i]			=  npcStatVars['age']
 	$npcHair[npcStat_i]			= $npcStatVars['hair']
 	$npcClo[npcStat_i]			= $npcStatVars['outfit']
@@ -529,5 +529,4 @@ killvar 'npcStatVars'
 killvar 'npcStat_i'
 killvar 'npclastcalledn'
 
-
---- npcStat --------------------------------------------------
+--- npcStat ---------------------------------

locations/npcStat_clean.qsrc

@@ -85,4 +85,4 @@ if npcStat_clean_i < 9: jump 'npcStat_clean_loop2'
 
 killvar 'npc_Stat_clean_i'
 
---- npcStat_clean ---------------------------------------
+--- npcStat_clean ---------------------------------

locations/npcgeneratec.qsrc

@@ -172,7 +172,6 @@ if $ARGS[0] = 'assign_stats':
 	else
 		npc_sexskill[$ARGS[1]] = rand(1, 100)
 	end
-	silaVag = npc_sexskill[$ARGS[1]]
 end
 
 

locations/outdoors.qsrc

@@ -337,10 +337,14 @@ if $ARGS[0] = 'main':
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
 			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
-				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
-
-				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'
 
+				if $pantyworntype ! 'none':
+					$stat_panty_msg = '<b><font color="red">You''re not using any menstrual products during your period and blood is soaking your panties!</font></b>'
+				elseif PCloSkirt > 0:
+					'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
+				else
+					'<b><font color="red">You have blood flowing from your snatch and staining your pants.</font></b>'
+				end
 				gs 'sweat', 'add', 10
 				if pcs_mood > 20: pcs_mood -= 20
 				dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] -= 1'

locations/outfit.qsrc

@@ -30,7 +30,4 @@ if $ARGS[0] = 'exposure_calc':
 	if CoverFront < 0: CoverFront = 0
 end
 
-
-
-
---- outfit ----------------------------
+--- outfit ---------------------------------

locations/pav_clinic.qsrc

@@ -25,6 +25,8 @@ if $ARGS[0] = '':
 			act 'Leave': gt 'pav_clinic'
 		end
 	end
+	act 'Visit the therapist (1:00)': gt 'therapist', 'start'
+
 
 	if hour >= 0 and hour <= 23:
 		if gpoliuborka = 0:

locations/pav_commercial.qsrc

@@ -133,7 +133,7 @@ end
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
 if hypnoSchedule = 1:
-	if therapist_weekly_block = 0 and week = 4 :
+	if therapist_weekly_block = 0 :
 		if hour >= 0 and hour < 23:
 			act '<b>Go see your therapist (1:00)</b>': minut += 5 & gt 'therapist', 'start'
 		end

locations/pav_disco.qsrc

@@ -710,11 +710,7 @@ if $ARGS[0] = 'dance_partner':
 			end
 		elseif DaPaTipeRand >= 90:
 			!!traveling_expenses
-			if rand(0, 1) = 0:
-				$npc_residence[$boy] = 'city_residential'
-			else
-				$npc_residence[$boy] = 'city_center'
-			end
+			$npc_residence[$boy] = 'city_center'
 			npc_finance[$boy] = 2
 			bmtimeTipe = 2
 			DrunkDPTrand = rand(0,100)

locations/pav_hotel.qsrc

@@ -141,7 +141,7 @@ else
 end
 
 gs 'schedule', 'A186'
-if therapistQW['hotel_key'] = 2 and locat['A186'] = 2 and week = 6 and hour >= 20 and pcs_traits['commando_lvl'] = 3 and therapistQW['hotel_day'] ! daystart and therapistQW['escaped'] = 0:
+if therapistQW['hotel_key'] = 2 and pcs_traits['commando_lvl'] = 3 and therapistQW['escaped'] = 0:
 	therapistQW['hotel_day'] = daystart
 	gs 'willpower', 'misc', 'resist', 'medium'
 

locations/pav_lake_nude.qsrc

@@ -52,7 +52,7 @@ if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and h
 		act 'Run away': ivanfedorseennaked = daystart & gt 'pav_lake_nude'
 		act 'Greet them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else
-		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
+		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''ivanfedorseennaked = daystart & gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end
 

locations/saveupdater.qsrc

@@ -4132,7 +4132,7 @@ if temp_current_save_version < 00090304:
 		$lover[] = $husID
 
 		npc_rel[$husID]			= husband
-		npc_rel_type[$husID]	= 'husband'
+		$npc_rel_type[$husID]	= 'husband'
 		$npc_usedname[$husID]	= $husname
 		if $husHair = 'black':
 			npc_haircol[$husID] = 0

locations/sex_ev_condoms.qsrc

@@ -1353,6 +1353,9 @@ if $ARGS[0] = 'no_sex_only':
 							'"I guess I could do that," you say reluctantly, moving down between his legs.'
 							act'Blow him':gt 'sex_ev_foreplay', 'bj_sub1'
 						end
+					else
+						'"I guess I could..." he says.'
+						act'Get eaten out':gs 'sex_ev_foreplay', 'pussy_lick'
 					end
 				end
 			end

locations/sex_ev_reactions_creampie.qsrc

@@ -10,15 +10,11 @@ if $ARGS[0] = 'creampie_react':
 		if sex_ev['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3 and npc_free_creampies[$boy] = 0:
 			gs'sex_ev_reactions_creampie', 'thought_no_creampies'
 		else
-			if sex_ev['reluctant_creampie'] ! 1 and sex_ev['unhappy_creampie'] ! 1:
-				act'Happy creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_happy'
-			end
 
-			if sex_ev['unhappy_creampie'] ! 1:
-				act'Conflicted creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_conflicted'
-			end
+			gs'sex_ev_reactions_creampie', 'creampie_happy'
+			gs'sex_ev_reactions_creampie', 'creampie_conflicted'
 
-			act'Unhappy creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_unhappy'
+			gs'sex_ev_reactions_creampie', 'creampie_unhappy'
 			gs'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 			gs'sex_ev_talk', 'free_creampies'
 			gs'sex_ev_reactions_creampie', 'creampie_safe_day'
@@ -319,35 +315,50 @@ if $ARGS[0] = 'creampie_safe_day':
 end
 
 if $ARGS[0] = 'creampie_happy':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_felt_great'
-	gs'sex_ev_reactions_creampie', 'feel_full'
-	gs'sex_ev_reactions_creampie', 'love_creampies'
-	gs'sex_ev_reactions_creampie', 'cum_together_kiss'
-	gs'sex_ev_reactions_creampie', 'cum_together_best'
-	gs'sex_ev_reactions_creampie', 'creampie_apologize'
-	gs'sex_ev_reactions_creampie', 'already_creampied_me'
-	gs'sex_ev_reactions_creampie', 'thanks_for_asking'
-	gs'sex_ev_reactions_creampie', 'creampie_enjoy_that'
-	gs'sex_ev_reactions_creampie', 'creampie_safe_day'
-	gs'sex_ev_reactions_creampie', 'pullout_game_tease'
-	gs'sex_ev_talk', 'free_creampies'
-	gs'sex_ev_reactions_creampie', 'have_plan_b2'
+	if sex_ev['reluctant_creampie'] ! 1 and sex_ev['unhappy_creampie'] ! 1:
+		act'Happy creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_felt_great'
+			gs'sex_ev_reactions_creampie', 'feel_full'
+			gs'sex_ev_reactions_creampie', 'love_creampies'
+			gs'sex_ev_reactions_creampie', 'cum_together_kiss'
+			gs'sex_ev_reactions_creampie', 'cum_together_best'
+			gs'sex_ev_reactions_creampie', 'creampie_apologize'
+			gs'sex_ev_reactions_creampie', 'already_creampied_me'
+			gs'sex_ev_reactions_creampie', 'thanks_for_asking'
+			gs'sex_ev_reactions_creampie', 'creampie_enjoy_that'
+			gs'sex_ev_reactions_creampie', 'creampie_safe_day'
+			gs'sex_ev_reactions_creampie', 'pullout_game_tease'
+			gs'sex_ev_talk', 'free_creampies'
+			gs'sex_ev_reactions_creampie', 'have_plan_b2'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_conflicted':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_ask_next_time'
-	gs'sex_ev_reactions_creampie', 'told_you_not_to_creampie'
-	gs'sex_ev_reactions_creampie', 'cum_together_no_bc1'
+	if sex_ev['unhappy_creampie'] ! 1 and sex_ev['creampie_allowance'] < 1:
+		act'Conflicted creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_ask_next_time'
+			gs'sex_ev_reactions_creampie', 'told_you_not_to_creampie'
+			gs'sex_ev_reactions_creampie', 'cum_together_no_bc1'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_unhappy':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_gross'
-	gs'sex_ev_reactions_creampie', 'creampie_ask_next_time_mad'
-	gs'sex_ev_reactions_creampie', 'cum_together_no_bc2'
-	gs'sex_ev_reactions_creampie', 'promised_no_creampie'
+	if sex_ev['creampie_allowance'] < 1:
+		act'Unhappy creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_gross'
+			gs'sex_ev_reactions_creampie', 'creampie_ask_next_time_mad'
+			gs'sex_ev_reactions_creampie', 'cum_together_no_bc2'
+			gs'sex_ev_reactions_creampie', 'promised_no_creampie'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_cum_together_react':

locations/sex_ev_stats.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'starting_stats':
 		$npc_lovername[$boy] = 'babe'
 		$npc_lovername2[$boy] = 'baby'
 	end
-	if npc_creampie_permission[$boy] = 1: sex_ev['creampie_allowance'] = 1
+	if npc_creampie_permission[$boy] = 1 or npc_free_creampies[$boy] = 2: sex_ev['creampie_allowance'] = 1
 	if birth_control['think_safe'] = 1:
 		if tabletkishot > 0:
 			$sex_ev['bc_type'] = 'shot'

locations/shop_danilovich.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'buy_refill_bottle':
 		karta -= 1000
 	end
 	mc_inventory['refill_bottle'] = 1
-	gt $loc_s, $arg_s
+	gt $loc_s, $args_s
 end
 
 if $ARGS[0] = 'clo':

locations/shortgs.qsrc

@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'color_is_dark':
 	killvar 'shortgs_cid_b'
 end
 
-!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, {oxford_comma})
+!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, ', ', ' and ', ', and ')
 !! returns a string with the array entries listed:
 !! $arr[0] = 'Sidisi'	-> returns: 'Sidisi'
 !! $arr[1] = 'Eriette'	-> returns: 'Sidisi and Eriette'
@@ -1195,16 +1195,21 @@ end
 !! $ARGS[4] is the small separator (defaults to ', ')
 !! $ARGS[5] is the final separator for 2 items (defaults to ' and ')
 !! $ARGS[6] is the final seperator for more items (defaults to ', and ')
+!!
+!! If you want to list the entries of an array, you can use
+!! func('shortgs', 'enumerate_list', '$arrname', 0, 0, '<br>', '<br>', '<br>')
+
+
 if $ARGS[0] = 'enumerate_list':
 	$temp_sgs_text = ''
 	$sgs_arrname = $ARGS[1]
 
-	if ARGS[2] = 0:
+	if ARGS[2] <= 0:
 		temp_sgs_i = 0
 	else
 		temp_sgs_i = ARGS[2]
 	end
-	if ARGS[3] = 0:
+	if ARGS[3] <= 0:
 		temp_sgs_max_i = arrsize($sgs_arrname)
 	else
 		temp_sgs_max_i = temp_sgs_i + ARGS[3]
@@ -1230,17 +1235,18 @@ if $ARGS[0] = 'enumerate_list':
 	if temp_sgs_max_i = 0:
 		!!empty on purpose
 	elseif temp_sgs_max_i = 1:
-		dynamic '$temp_sgs_text = <<$sgs_arrname>>[0]'
+		dynamic "$temp_sgs_text = <<$sgs_arrname>>[0]"
 	elseif temp_sgs_max_i = 2:
-		dynamic '$temp_sgs_text = <<$sgs_arrname>>[0] + <<$temp_sgs_sep[1]>> + <<$sgs_arrname>>[1]'
+		dynamic "$temp_sgs_text = <<$sgs_arrname>>[0] + '<<$temp_sgs_sep[1]>>' + <<$sgs_arrname>>[1]"
 	else
 		temp_sgs_i = 0
 		:sgs_enum_list
-			dynamic '$temp_sgs_text += <<$sgs_arrname>>[<<temp_sgs_i>>]'
+			dynamic "$temp_sgs_text += <<$sgs_arrname>>[<<temp_sgs_i>>]"
 			temp_sgs_i += 1
 		if temp_sgs_i < temp_sgs_max_i - 1: $temp_sgs_text += $temp_sgs_sep[0] & jump 'sgs_enum_list'
 
-		dynamic '$temp_sgs_text += <<$temp_sgs_sep[2]>> + <<$sgs_arrname>>[<<temp_sgs_i>>]'
+		dynamic "$temp_sgs_text += '<<$temp_sgs_sep[2]>>' + <<$sgs_arrname>>[<<temp_sgs_i>>]"
+
 		killvar 'temp_sgs_i'
 	end
 

locations/sleep_events.qsrc

@@ -158,6 +158,7 @@ if $ARGS[0] = 'vibr_orgasm2':
 	menu_off = 1
 	pcs_horny = 0
 	orgasm += 1
+	vibratorIN = 0
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/oface/o_face.jpg"></center>'

locations/stat_display.qsrc

@@ -683,6 +683,9 @@ if $clothingworntype ! 'nude':
 		$stat_panty_text = '<br><font color = <<iif(PCloCoverFront = 1, ''#0064FF'', ''#FF0000'')>>><<$stat_panty_msg>></font>'
 		killvar '$temp_sdp_text'
 	end
+	if $pantyworntype ! 'none' and (isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1))):
+		$stat_panty_msg = 'You''re not using any menstrual products during your period and blood is soaking your panties!'
+	end
 end
 
 !!--------------- CLOTHING ---------------!!
@@ -1515,8 +1518,10 @@ else
 	if $stat_bra_msg ! '' and $braworntype ! 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/bra.png"></a></td>'
 
 	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/boobs_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
-
-	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
+	
+	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and (isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1))):
+		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties_red.png"></a></td>'
+	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties.png"></a></td>'
 	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties_red.png"></a></td>'

locations/stripclub.qsrc

@@ -4,7 +4,7 @@ close ALL
 
 if $ARGS[0] = 'start':
 	*clr & cla
-	minut += 5
+	minut += 1
 	$menu_loc = 'stripclub'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -528,7 +528,7 @@ if $ARGS[0] = 'hire3':
 	end
 	'"Did you have any questions for me?" he asks.'
 	'"Just two," you reply. "When do I work and what do I get paid?"'
-	'He chuckles. "Straight to the point I see. The club operates between 18:00 and 03:00 and I currently have two shift patterns open. Wednesday and Thursday nights, or Friday and Saturday nights. You get paid monthly plus tips. Interested?"'
+	'He chuckles. "Straight to the point I see. The club operates between 18:00 and 03:00 and I currently have two shift patterns open. Wednesday and Thursday nights, or Friday and Saturday nights. You get paid weekly plus tips. Interested?"'
 
 	act 'Take the job':
 		cla

locations/stwork.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	CLOSE 'sound/street_club.mp3'
 	'<center><b><font color="maroon">Dressing Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage.jpg"></center>'
-	'The room has <a href="exec:gt ''mirror'', ''start''">mirrors</a> all along the walls, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in. The whiteboard serving as the signup sheet for <a href="exec:gt ''stripclub_schedule'', ''set_schedule''">this week</a> and <a href="exec:gt ''stripclub_schedule'', ''next_week_set_schedule''">next week</a> is suctioned to one of the mirrors with a pen on top.'
+	'The room has <a href="exec:gt ''mirror'', ''start''">mirrors</a> all along the walls, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in. The whiteboard serving as the signup sheet for <a href="exec: gt ''stwork'', ''set_schedule'', ''this_week'' ">this week</a> and <a href="exec: gt ''stwork'', ''set_schedule'', ''next_week'' ">next week</a> is suctioned to one of the mirrors with a pen on top.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'
 	if $clothingworntype = 'nude':
 		'To the side is a door which overlooks the staff parking lot to the rear, used as a private entrance so girls don''t to deal with scummy customers queuing out front. Always standing by this entrance is a <a href="exec:gt ''stwork'', ''guard''">security guard</a>, who isn''t going to let you walk outside unless you put some clothes on.'
@@ -55,6 +55,16 @@ if $ARGS[0] = 'start':
 	if hour < 3 or (hour = 2 and minut < 45): act 'Take a break': gt 'stwork', 'rest'
 end
 
+if $ARGS[0] = 'set_schedule':
+	if $ARGS[1] = 'this_week':
+		gs 'stripclub_schedule', 'set_schedule'
+	elseif $ARGS[1] = 'next_week':
+		gs 'stripclub_schedule', 'next_week_set_schedule'
+	end
+
+	act 'Return': gt $loc, $loc_arg
+end
+
 if $ARGS[0] = 'set_perform_acts':
 	!! Private dance available
 	if strip_club['lapdance_chance'] > 0:
@@ -75,8 +85,9 @@ if $ARGS[0] = 'set_perform_acts':
 
 	if kosmetica >= 3 or pcs_makeup >= 4:
 		act 'Prepare for your show':
-			*clr & cla
+			cla
 			if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
+				*clr
 				dynamic $showerdin
 				minut += 5
 				'<h3>Staff Bathroom</h3>'
@@ -100,7 +111,7 @@ if $ARGS[0] = 'set_perform_acts':
 			!!'You put your clothes back on before heading back onto the stage.'
 			act 'Go on stage':
 				if pcs_leghair <= 3 and pcs_pubes <= 25:
-					gt 'stwork2', 'strip'
+					gt 'stwork2', 'strip_show_start'
 				else
 					*clr & cla
 					!! IMAGE
@@ -302,7 +313,7 @@ if $ARGS[0] = 'stripgirl':
 	elseif temp_rand = 13:
 		'"I caught Ruby snorting shit right here on the make-up table! Can she at least do it in the fucking bathroom?"'
 	elseif temp_rand = 14:
-		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."' 
+		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."'
 	elseif temp_rand = 15:
 		'"I saw a guy basically salivating at Opal''s huge tits while throwing all his money at her feet. Some girls have it fucking easy..."'
 	else

locations/stwork2.qsrc

@@ -3,6 +3,8 @@
 if $ARGS[0] = 'strip_show_start':
 	*clr & cla
 	strip_club['cust_boos'] = 0
+	strip_club['strip_tips'] = 0
+	strip_club['dancing_rounds'] = 3
 	$strip_club['bra_type'] = $braworntype
 	strip_club['bra_number'] = brawornnumber
 	$strip_club['panty_type'] = $pantyworntype
@@ -13,7 +15,7 @@ if $ARGS[0] = 'strip_show_start':
 	'<center><b><font color="maroon">Stage</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
 	'You''re ready to go as the music starts. It''s now or never.'
-	act 'Go on stage': gs 'stwork2', 'strip_hub2', 1
+	gs 'stwork2', 'strip_hub2', 1
 end
 
 if $ARGS[0] = 'strip_show_end':
@@ -67,7 +69,10 @@ if $ARGS[0] = 'strip_hub2':
 			'There are men sitting in front of the stage, cheering as soon as your name is announced. Some stand to applaud while chanting your name and whistling.'
 		end
 	end
-	if hour < 2 or (hour = 2 and minut < 45):
+	if (hour > 2 or hour = 2 and minut > 45) and (hour < 17 or (hour = 17 and minut < 30)):
+		pcs_hairbsh = 0 & strip_club['total_stripshows'] += 1
+		'Your shift is over for tonight. Time to head home.'
+	else
 		if strip_club['dancing_rounds'] = 3: lapdance = 0
 		if strip_club['dancing_rounds'] > 0:
 			if $clothingworntype ! 'nude':
@@ -122,9 +127,6 @@ if $ARGS[0] = 'strip_hub2':
 				end
 			end
 		end
-	else
-		pcs_hairbsh = 0 & strip_club['total_stripshows'] += 1
-		'Your shift is over for tonight. Time to head home.'
 	end
 
 	act 'Leave the stage': gt 'stwork2', 'strip_show_end'
@@ -206,7 +208,7 @@ if $ARGS[0] = 'dance_clothed':
 	gs 'sweat', 'add', 5
 	fat -= 1
 	gs 'exp_gain', 'dancero', rand(1,2)
-	strip_club['strip_tips'] = rand(pcs_dancero, 5 * pcs_dancero) / 10
+	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 10
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
@@ -225,7 +227,7 @@ if $ARGS[0] = 'strip_clothes':
 	gs 'exp_gain', 'dancero', rand(1,2)
 	gs 'exp_gain', 'inhib', rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
-	strip_club['strip_tips'] = rand(pcs_dancero, 5 * pcs_dancero) / 7
+	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 7
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
 	'You start moving seductively around the pole in the center of the stage.'

locations/stwork3.qsrc

@@ -1,6 +1,6 @@
 #stwork3
 !! 2024/08/10
-if $ARGS[0] = 'work':
+if $ARGS[0] = 'start':
 	*clr & cla
 	if strip_club['first_bar_shift'] = 0:
 		gt 'stwork3', 'first_shift'
@@ -575,17 +575,31 @@ if $ARGS[0] = 'tips':
 	money += strip_club['tips_total']
 	!! Reset daily modifier
 	strip_club['tips_roll'] = 0
+	strip_club['bar_shifts'] += 1
 	!! Skill and attribute gains
 	if pcs_servng < 100: gs 'exp_gain', 'servng', 1
 	if pcs_vital < 30: gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
 	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
 	*clr & cla
 	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/city/.jpg"></center>'
 	'With your shift finally over, you sit at the bar and count out your tips.'
 	*nl
 	'You made <<strip_club[''tips_total'']>> <b>₽</b> in tips tonight.'
-	if strip_club['manager'] = 1:
+
+	if (strip_club['stripbarwork'] = 1 and week = 4) or (strip_club['stripbarwork1'] = 1 and week = 6):
+		*nl
+		temp_shifts_pay = 125 * 9 * strip_club['bar_shifts']
+		'After counting your tips, Ivanna pays you <<temp_shifts_pay>> <b>₽</b> for the <<strip_club[''bar_shifts'']>> shifts you''ve worked.'
+		money += temp_shifts_pay
+		killvar 'temp_shifts_pay'
+		strip_club['bar_shifts'] = 0
+		gs 'stat'
+	end
+
+	*nl
+	if strip_club['manager_speak'] = 1:
 		'Ivanna asked to speak with you before you leave.'
 		act 'Speak with Ivanna': gt 'stwork3', 'manager_speak'
 	else
@@ -667,9 +681,10 @@ if $ARGS[0] = 'manager_speak':
 						cla
 						'You suddenly feel your orgasm building as you continue riding Ivanna. "That''s it, <<$pcs_nickname>>, cum for me. Let''s cum together!"'
 
-						$orgasmtext = 'You suddenly feel a wave of pleasure overwhelm you and cry out in orgasm as Ivanna keeps thrusting. Your pussy tightens around her cock and you soon feel it twitching and throbbing inside you as spurt upon spurt of thick, warm cum is unloaded deep inside you. Ivanna moans loudly in pleasure as she pumps what feels like an endless stream of cum into your pussy.'
+						$orgasm_txt = 'You suddenly feel a wave of pleasure overwhelm you and cry out in orgasm as Ivanna keeps thrusting. Your pussy tightens around her cock and you soon feel it twitching and throbbing inside you as spurt upon spurt of thick, warm cum is unloaded deep inside you. Ivanna moans loudly in pleasure as she pumps what feels like an endless stream of cum into your pussy.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'vaginal', 5
+						gs 'cum_call', 'vaginal', 'Ivanna', 1, 0, -1, 40
 						gs 'arousal', 'end'
 						gs 'stat'
 

locations/tattoo_management.qsrc

@@ -233,8 +233,4 @@ if $ARGS[0] = 'wrist_image':
 	exit
 end
 
-
-
-
-
---- tattoo_management --------------------------------------------------
+--- tattoo_management ---------------------------------

locations/uni_dorm.qsrc

@@ -1021,7 +1021,7 @@ if $ARGS[0] = 'dorm_room':
 		!! 2. Sveta is working in the brothel too
 		!! 3. Sveta knows Vika works in the brothel and Vika knows Sveta is just as big a slut as she is.
 		if vika_inroom = 1:
-			acces['noporn'] = 1
+			access['noporn'] = 1
 			access['nocamshow'] = 1
 			$access['noporn'] = 'You shouldn''t watch porn with Vika in the room!'
 			$access['nocamshow'] ='You can''t do any webcam shows with Vika in the room!'

locations/viktor_sex.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'first_time':
 		'"Fuck, such a tight pussy! I''m going to have fun with this," he says as he grips your ass in his hands.'
 		'You let out a lewd squeal as he thrusts up into you, bottoming out inside you as he starts fucking you.'
 		'After a few minutes, the car is filled with your loud moans of pleasure and the sound of flesh slapping against flesh as Viktor pounds your pussy, overwhelming you with a wave of pleasure.'
-		$orgasmtxt = 'The pleasure is overwhelming and you eventually scream out in ecstasy as a powerful orgasm washes over you, your legs going weak as a result.'
+		$orgasm_txt = 'The pleasure is overwhelming and you eventually scream out in ecstasy as a powerful orgasm washes over you, your legs going weak as a result.'
 		'Viktor keeps pounding you before his breathing intensifies and he starts fucking you even harder. "I''m gonna cum, baby girl!"'
 
 		act 'Creampie': gt 'viktor_sex', 'first_creampy'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'viktor_sex1':
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/hard3.mp4"></video></center>'
 			'He moves in behind you and pulls you up onto your knees, arching your back as he shoves his dick back inside you and starts roughly fucking you doggystyle.'
-			$orgasmtxt = 'You''re too overwhelmed to do anything but scream in pleasure and beg him to go faster as you feel your orgasm approaching. A powerful wave of pleasure soon washes over you and leaves you quivering under Viktor as he continues fucking you throughout.'
+			$orgasm_txt = 'You''re too overwhelmed to do anything but scream in pleasure and beg him to go faster as you feel your orgasm approaching. A powerful wave of pleasure soon washes over you and leaves you quivering under Viktor as he continues fucking you throughout.'
 			'It only takes a few minutes of this for him to cry out that he''s going to cum.'
 
 			act 'Creampie': gt 'viktor_sex', 'viktor_creampie'

locations/wakeup.qsrc

@@ -27,6 +27,8 @@ end
 
 
 if $ARGS[0] = 'get_out':
+	vibratorIN = 1
+	analplugIN = 1
 	menu_off = 1
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
 	if sleepVars['slept_in'] = 1: