Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/AlbStars.qsrc

@@ -1255,7 +1255,7 @@ if $ARGS[0] = 'StarletsEnd':
 end
 
 if $ARGS[0] = 'StarletsPracticeMissed':
-	clr & cla
+	*clr & cla
 	menu_off = 1
 	minut += 5
 	gs 'stat'

locations/foto.qsrc

@@ -378,21 +378,27 @@ if $ARGS[0] = 'studio':
 			if pcs_apprnc < 80:
 				*clr & cla
 				menu_off = 1
-				'<center><b><font color="maroon">Photographer</font></b></center>'
+				'<center><b><font color="maroon">Floor Manager</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"I''m sorry but you are going to have to work on your appearance if you want to do a shoot."'
 				act 'Leave':gt'foto','studio'
 			elseif pcs_sweat >= 20:
 				'"You''re all sweaty. Go take a shower before asking for work. And don''t forget to do your makeup after."'
 				act'Go to the showers':gt'foto','showers'
+			elseif $stat_cum_msg ! '':
+				'"Ugh, <<$pcs_lastname>>, what the hell is that?" he looks at you and the visible cum on you with disgust. "We don''t care what your sexual habits are outside of work, but we''re not shooting Japanese porn here. At least take a shower before a shoot."'
+				act'Go to the showers':gt'foto','showers'
 			elseif pcs_leghair > 3:
 				'"Go shave your legs, we''re not running a nature special on gorillas."'
 				act'Go to the showers':gt'foto','showers'
 			elseif mesec > 0 and isprok = 0:
-				'"What the hell <<$pcs_nickname>>!"'
+				'"What the hell <<$pcs_lastname>>!"'
 				'You follow his gaze to see the blood running down your legs.'
 				'"Go wash that off and switch to tampons already! There''s a dispenser in the shower room."'
 				act'Go to the showers':gt'foto','showers'
+			elseif pcs_makeup = 0:
+				'"Your makeup is smeared all over your face <<$pcs_lastname>>. Go clean up and see the makeup artists first."'
+				act'Go to the showers':gt'foto','showers'
 			else
 				if model_week = (daystart - week) / 7 and model_job_week >= 2:
 					gt 'foto', 'practicemodel'

locations/foto_events.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'skill':
 		gt'foto_events','pool2'
 !!	elseif mdlng_skill_event = 4:
 !!		gt'foto_events','runway1'
-	elseif mdlng_skill_event = 4 and daystage < 4 and daystage > 2:
+	elseif mdlng_skill_event = 4 and daystage = 3:
 		gt'foto_events','runway2'
 	elseif mdlng_skill_event = 5:
 		gt'foto_events','wet'
@@ -965,16 +965,16 @@ if $ARGS[0] = 'special':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"Hey!" you call out to one of the studio managers. "Looking for some more work, any special jobs still available today?"'
 	act'Return to the main floor':gt'foto','studio'
-	if specialjob1 < 95 and specialjob2 < 95 and specialjob3 < 95 and specialjob4 < 95 and specialjob5 < 95 and specialjob6 < 95 and (specialjob7 < 95 and city_kickboxing >=30 and pcs_inhib >= 45) and (specialjob8 < 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+	if specialjob1 > 95 or specialjob2 > 95 or specialjob3 > 95 or specialjob4 > 95 or specialjob5 > 95 or specialjob6 > 95 or (specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45) or (specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
+		act'Look at the list':gt 'foto_events','list'
+	else
 		no_job_reason = rand(1,2)
 		if no_job_reason = 1:
 			'"Sorry <<$pcs_firstname>>, we don''t have anything today. Check in again tomorrow, maybe there''ll be something for you."'
 		else
 			'"Sorry <<$pcs_firstname>>, we already assigned all the requests we had today to other girls. Got none left for you. Check in again tomorrow, maybe there''ll be something for you."'
 		end
-	else
-		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
-		act'Look at the list':gt 'foto_events','list'
 	end
 end
 if $ARGS[0] = 'list':
@@ -986,14 +986,14 @@ if $ARGS[0] = 'list':
 		'You wave goodbye as you walk back to the main floor.'
 		act'Go back to the main floor':gt'foto','studio'
 	end
-	if specialjob1 >= 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
-	if specialjob2 >= 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
-	if specialjob3 >= 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
-	if specialjob4 >= 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
-	if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
-	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-	if specialjob7 >= 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''kickboxing_documentary''">   Kickboxing documentary</a>'
-    if specialjob8 >= 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events'',''track_&_field_documentary''">   Track & Field documentary</a>'
+	if specialjob1 > 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
+	if specialjob2 > 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
+	if specialjob3 > 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
+	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
+	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
+	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
+	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''kickboxing_documentary''">   Kickboxing documentary</a>'
+    if specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events'',''track_&_field_documentary''">   Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end
@@ -2212,6 +2212,7 @@ if $ARGS[0] = 'wet':
 							modelfoto_nip += 1
 							modelfoto_topless += 1
 							modelfoto_nude += 1
+							if pcs_makeup > 1:pcs_makeup = 0
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4

locations/gdksport.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	*nl
-	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW{'StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 cheerleaders_on = 1: 'Albina is at cheerleading, so there is no Starlets training today.'
+	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and cheerleaders_on = 1: 'Albina is at cheerleading, so there is no Starlets training today.'
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
@@ -253,7 +253,7 @@ if $ARGS[0] = 'dance2':
 	else
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further.'
 
-		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0:
+		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
 			if alterstrtimg = 13:
 				gt 'AlbStars', 'albina3'
 			elseif grupTipe = 1 or grupTipe = 2:

locations/gschool_lessons4.qsrc

@@ -725,7 +725,7 @@ if $ARGS[0] = 'pe':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nushtopless.jpg"></center>'
 							'You turn your head and look over to see Anushka running next to you, but she has her top off and is carrying it in her hand. You can''t help but notice her small breasts bouncing with every step she takes. She notices where your eyes drift and grins at you. She runs alongside you for most of the run and a few of the boys pass the two of you, who all slow down for a bit to take a good long look. Some of the girls look as well, but most just give dirty or disgusted looks to Anushka.'
-							gs 'arousal', 'voyeur', 5
+							gs'arousal','erotic_nudity', 5
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finish run':gt 'gschool_lessons4', 'postphys'
@@ -746,7 +746,7 @@ if $ARGS[0] = 'pe':
 					if runinside = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/butt.jpg"></center>'
 						'While running laps around the inside of the gym, Anushka passes behind Mr. Nikolaevich and pulls down the back of her shorts to show off her panty clad ass. It doesn''t take too long before many of the boys catch up to Anushka, but not pass her. They wait until she passes behind the teacher and flashes them her panty clad ass again.'
-						gs 'arousal', 'voyeur', 5
+						gs'arousal','erotic_nudity', 5
 						gs 'arousal', 'end'
 						gs 'stat'
 					else
@@ -939,7 +939,7 @@ if $ARGS[0] = 'pe':
 			if jumpingjacks = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bouncebhand.jpg"></center>'
 				'A girl from your brother''s grade is doing jumping jacks and her breasts are really bouncing, she obviously isn''t wearing a bra. The bouncing of her breasts starts to draw the attention of a lot of the boys, just as her friend walks up behind her, reaches round and grabs her boobs. The first girl lets out a startled squeak then laughs, followed by a blush when her friend whispers in her ear and she sees all the boys staring.'
-				gs 'arousal', 'voyeur', 2
+				gs'arousal','erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue': gt 'gschool_lessons4', 'jumping_jacks'
@@ -953,7 +953,7 @@ if $ARGS[0] = 'pe':
 			if jumpingjacks = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/nipslip.mp4"></video></center>'
 				'Alyona apparently doesn''t believe in wearing sports bras. During the pushup part of the class, the top of her boob pops out of her tank top, showing her nipple off for everyone to see. Anushka quickly points it out to her, making her blush a deep red as she quickly covers her nipple up and tries to ignore the laughter and all the staring boys around her.'
-				gs 'arousal', 'voyeur', 2
+				gs'arousal','erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue': gt 'gschool_lessons4', 'pushups'
@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'postphys':
 				'The sounds and sight start making you wet, but you aren''t here to masturbate, so you keep taking as many pictures as you can.'
 				'Pavlovich seems to reach his limit and pulls mostly out, ordering her to keep her mouth open between gasps, and shoots thick ropes of cum into her waiting mouth.'
 				'Deciding you have enough evidence, and not wanting to play your hand just yet, you quietly close the door and sneak off, extremely pleased with yourself.'
-				gs 'arousal', 'voyeur', 5
+				gs'arousal','erotic_nudity', 5
 				gs 'stat'
 				act 'Go to the showers':
 					gs 'arousal', 'end'
@@ -1257,9 +1257,47 @@ if $ARGS[0] = 'shower2':
 				end
 			end
 		end
+	elseif gymshower = 5 and pcs_pubes >= 40:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho2.jpg"></center>'
+		'As you step into the shower, some of the girls who are chatting to each other turn to look at you and start guffawing.'
+		'"Seriously <<$pcs_nickname>>? Waxing isn''t just for floors you know!"'
+		'"It''s like there''s a gorilla between her legs!"'
+		'"You''d need a chainsaw to mow that lawn!"'
+		'Other girls in the room uncomfortably ignore the exchange, pretending not to hear because they don''t want to get involved or just trying to avoid becoming a target themselves.'
+		act'Take the abuse':
+			cla & *clr
+			pcs_mood -= 10
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic3.jpg"></center>'
+			'You try to ignore their barbs but it really gets under your skin and it shows. Seeing their effectiveness, they re-double their abuse, taunting you more and more.'
+			'"If I''ve got a landing strip, what does she have? A farmer''s field?!"'
+			'"She probably lets it grow out like that because she doesn''t want to let boys know she''s got beef curtains down there."'
+			'"Ha! You kidding? What boy would want to fuck a furball like that? They probably just see it and run away thinking it''s bigfoot!"'
+			'They cackle to themselves while you miserably douse your head under the shower, trying to drown out their hurtful words.'
+			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+		end
+		
+		act'Tell them to fuck off':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho1.jpg"></center>'
+			'"Fuck off, would you!" you hiss at them, twisting the faucet open a little harder than you intended to. Unfortunately, your reaction seems to have the opposite effect you hoped for and they double down now they they know they''re getting under your skin.'
+			'"That''s probably the only kind of fuck you can get with a <i>jungle</i> like that down there!"'
+			'"You''d need a forest guide just to find her pussy under all that!"'
+			'"A machete to hack your way through too!"'
+			'They cackle in sadistic glee and you spend the rest of your shower fuming, face somehow feeling hotter than the water streaming down it.'
+			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+		end
+		
+		act'Ignore it':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You roll your eyes and ignore them completely, turning on the faucet and rinsing your hair. They continue to sling insults at you, but you pay them no mind, picking up the soap and beginning to scrub your body.'
+			*nl
+			'After a few more tries, they realize that they aren''t going to get any more fun out of you and go turn back to conversing amongst themselves, finally letting you shower in peace.'
+			act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho<<rand(1,7)>>.jpg"></center>'
-		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes of basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
+		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you, and rinse the sweat from your body. After a tiring gym class, the hot water feels great, soothing your aching muscles and relaxing your mind. After a few minutes of enjoyment, you grab some soap and start lathering yourself up. You quickly become lost in the task, the sound of your scrubbing mixing with the squeak of faucets, the slap of your classmates feet across the tile floor, and the endless white noise of cascading water.'
 	end
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 	act 'Take a long shower': gt 'gschool_lessons4', 'long_shower'
@@ -1294,7 +1332,7 @@ if $ARGS[0] = 'long_shower':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar2.jpg"></center>'
 				'As you are showering, you turn and see Lazar standing there with his hard cock in his hand, stroking it while he watches you shower with a big grin on his face. "Hey <<$pcs_nickname>> looking good."'
 				'You are shocked, but before you can react, he keeps talking. "Why don''t you suck my dick?" he says as he starts walking towards you, still stroking his hard cock. You can''t help but stare at his dick. It is as long and nearly as thick as your forearm.'
-				gs 'arousal', 'voyeur', 2
+				gs'arousal','erotic_nudity', 2
 				gs 'stat'
 				act 'Suck his dick': gt 'gschool_sex', 'lazar_lockerroom'
 				gs 'willpower', 'sex', 'resist', 'medium'
@@ -1327,7 +1365,7 @@ if $ARGS[0] = 'long_shower':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/vd2.jpg"></center>'
 				'As you are showering, you turn and see Vitek and Dan standing there watching you shower with huge smiles on their face. Both of them are only wearing towels, as if they had walked over here after getting out of the boys shower. They both let their towels drop, showing off their dangling dicks. "Get on your knees so you can suck our dicks." Dan orders.'
-				gs 'arousal', 'voyeur', 2
+				gs'arousal','erotic_nudity', 2
 				gs 'stat'
 				act 'Get on your knees': gt 'gschool_sex', 'vd_lockerroom'
 				if grupTipe = 5:
@@ -1404,7 +1442,7 @@ if $ARGS[0] = 'long_shower':
 				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 					'As you walk into the locker room, you can tell it is Albina on the phone. She seems to be talking about the Starlets and a new show they will be doing. Once you start drying your hair, you can''t hear what she is saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
-					gs 'arousal', 'voyeur', 2
+					gs'arousal','erotic_nudity', 2
 					gs 'stat'
 					act 'Yes':
 						*clr & cla
@@ -1426,7 +1464,7 @@ if $ARGS[0] = 'long_shower':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 								'You pull away from her and step away. "What are you doing?"'
 								'She looks confused. "I thought... never mind." she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
-								gs 'arousal', 'voyeur', 2
+								gs'arousal','erotic_nudity', 2
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1442,7 +1480,7 @@ if $ARGS[0] = 'long_shower':
 						'You shake your head. "You''re pretty, but no."'
 						'She arches a shapely brow. "No? Then why do you check me out when I''m naked?"'
 						'You blush slightly. You didn''t think anyone noticed you checking out the other girls.'
-						gs 'arousal', 'voyeur', 2
+						gs'arousal','erotic_nudity', 2
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Deny it':
@@ -1452,7 +1490,7 @@ if $ARGS[0] = 'long_shower':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 							'"Sorry, I was just admiring what great shape you are in. I didn''t mean anything by it." you say while shaking your head.'
 							'She just shrugs. "Whatever." she grumbles before she starts getting dressed and you do the same. Soon you are both dressed and she walks out, leaving you alone in the locker room.'
-							gs 'arousal', 'voyeur', 2
+							gs'arousal','erotic_nudity', 2
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1477,7 +1515,7 @@ if $ARGS[0] = 'long_shower':
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 									'You pull away from her and step away. "What are you doing?"'
 									'She looks confused. "I thought... never mind." she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
-									gs 'arousal', 'voyeur', 2
+									gs'arousal','erotic_nudity', 2
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1550,82 +1588,84 @@ if $ARGS[0] = 'post_shower':
 	$menu_arg = 'post_shower'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
-	'You walk from the showers back into the locker room and over to your locker, where you grab your towel and diligently dry off your body. With your hair still wet, you''re ready to put the blow dryer to use. Once you finish blow drying your hair, you look around and see several other girls have left the showers and are getting dried off or dressed as well.'
+	'You walk back to your locker, throwing your towel in a bin along the way, and start rifling through it, gathering your things and grabbing your clothes.'
 	act 'Get Dressed': gt 'gschool_lessons4', 'dress'
 	act 'Check out the other girls':
 		*clr & cla
-		pcs_mood += 10
-		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/peekdress.jpg"></center>'
-		'You casually glance around at the other girls who are still getting dressed. Some are mostly dressed, a few are in their underwear and a few are still naked. Several of them are really good looking and you can feel yourself getting aroused as you watch them. You don''t think anyone noticed you checking them out.'
-		gs 'arousal', 'voyeur', 2
+		'You let your eyes wander around the room, checking out the other girls in your class. Some are almost finished getting dressed, a few are in their underwear and a few are still naked. It''s a nice view, one thing you''ll always appreciate about gym class.'
+		gs'arousal','erotic_nudity', 2
 		gs 'stat'
 		act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		act 'Check out Anushka':
 			*clr & cla
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nushpeek.jpg"></center>'
-			'You notice Anushka drying herself off with a towel. She is very pretty, some would even call her beautiful. You know most of the boys follow her around with their tongues hanging out. Even those not into alternative looks and tattoos find her pretty, making her one of the pretties girls in school. She has a petite build. Not too skinny, but just about right. She has average sized perky breasts, while her pussy is clean shaven. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-			gs 'arousal', 'voyeur', 3
+			'You peek at Anushka, walking in from the shower, still drying herself off. She has a petite build, a variety of tattoos large and small covering her body. Not too skinny, but just about right. Her breasts look to be a solid B or maybe a small C and very perky. Her pussy is completely smooth, you imagine she must have just shaved today or shaves every day for it to look like that.'
+			*nl
+			'Suddenly Anushka turns towards you. She follows your gaze and realizes you''re looking at her body, your eyes flick up to make contact with hers. You freeze, realizing you''re caught. Your brain goes into a panic, trying to think of some kind of excuse but she just winks at you and goes back to pretending like nothing happened.'
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Aylona':
 			*clr & cla
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/aylpeek.jpg"></center>'
-			'You notice Aylona drying herself off with a towel. She is kind of cute. No one would call her beautiful, but you know most of the boys think she is cute, especially the gopniks who are more into alternative looks and tattoos. She is pretty skinny, maybe too skinny, giving her an almost starved look. She would likely look better if she put on a little weight. She has small perky breasts, while her bush is neatly trimmed in a triangle. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-			gs 'arousal', 'voyeur', 3
+			'You take a peek at Aylona while she finishes drying herself off. Her body is incredibly thin, all skin, bones, and tattoos, almost anorexic. But as a result she has a flat tummy and small but perky breasts. Between her legs is a neatly trimmed triangle of carpet that matches the drapes. '
+			*nl
+			'After a few moments of observation, you let your gaze slip away and turn back to your own clothes.'
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Albina':
 			*clr & cla
 			checkoutalbina = 1
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/albpeek.jpg"></center>'
-			'You notice Albina going through her locker getting out her clothes. She is very pretty, some would even call her beautiful. You know most of the boys think she is one of the best looking girls in school and you can understand why - she has a near perfect body to go along with a beautiful face. She has a toned dancer build - thin with defined muscles and small perky breasts, complimented by a smoothly waxed pussy. You doubt she has much body fat, but she has a large, firm looking ass that is the envy of every girl in school. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-			gs 'arousal', 'voyeur', 3
+			if tits < 2:
+				'You glance at Albina while she pulls her clothes out of her locker. Thin with well toned muscles, a very shapely set of thighs, and ass that''s the envy of every girl in school, she has a great body and you can see why so many guys consider her the prettiest girl in your class. Even her pussy is waxed clean, though obviously not every guy gets to know that. The only thing that seems to put it up for contest is her relatively small chest. Upon inspection, you realize they''re probably not even that small and they have a great supple shape to them. They''re certainly bigger than yours at any rate. But you''ve got one of the smallest busts in class. Maybe you''re not the best point of reference for what''s big and what''s not...'
+			elseif tits = 2:
+				'You glance at Albina while she pulls her clothes out of her locker. Thin with well toned muscles, a very shapely set of thighs, and ass that''s the envy of every girl in school, she has a great body and you can see why so many guys consider her the prettiest girl in your class. Even her pussy is waxed clean, though obviously not every guy gets to know that. The only thing that seems to put it up for contest is her relatively small chest. Upon inspection, you realize they''re not even that small, probably about the same size as your own. And they''ve got great shape too, just the right combination of firmness and softness. But compared to your classmates (who are a bit bigger on average) she''s still got one of the smaller busts in the class, so it''s only natural she''d stack up poorly in direct comparison.'
+			else
+				'You glance at Albina while she pulls her clothes out of her locker. Thin with well toned muscles, a very shapely set of thighs, and ass that''s the envy of every girl in school, she has a great body and you can see why so many guys consider her the prettiest girl in your class. Even her pussy is waxed clean, though obviously not every guy gets to know that. The only thing that seems to put it up for contest is her relatively small chest. Upon inspection, you realize they''re probably not even that small, still a solid B-cup. And they''re they''ve got great shape too, just the right combination of firmness and softness. But compared to you and your classmates who are a bit bigger on average, she''s still got one of the smaller busts in your grade, so it''s to be expected she''d stack up poorly in direct comparison.'
+			end
+			*nl
+			'After a few moments of observation, you let your gaze slip away and turn back to your own clothes.'
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Christina':
 			*clr & cla
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/chrispeek.jpg"></center>'
+			'You glance at Christina walking across the room after tossing her towel in a bin. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs which look to die for. In combination with her very busty chest and a neat landing strip between her legs, her figure is rather pleasing, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine promoting some kind of new home workout.'
+			*nl
 			if christinaQW['dompath'] >= 7:
-				'You notice Christina walking around naked after getting dried off. Nobody would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landstrip. Ever since you beat her up, you keep an eye on her, making sure she cannot try and hurt anybody else.'
-				gs 'arousal', 'voyeur', 3
-				gs 'stat'
+				'You''ve been keeping an eye on her since your little tussle, making sure she doesn''t cause any trouble. After a few moments, she feels your gaze on her and turns to face you. You give her a look and she reluctantly turns back to her locker, not saying anything.'
 			else
-				'You notice Christina walking around naked after getting dried off. Nobody would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landstrip. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-				gs 'arousal', 'voyeur', 3
-				gs 'stat'
+				'After a few moments, you let your gaze slide away, not wanting to get caught and bitched out by Christina for looking at her.'
 			end
+			gs'arousal','erotic_nudity', 3
+			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Lariska':
 			*clr & cla
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/larpeek.jpg"></center>'
-			'You notice Lariska wrapping a towel around her head. No one would call her beautiful, but you know most of the boys think she is cute. She has a runners build - thin and taller than average with slightly defined muscles. She has small, perky breasts and neatly trimmed pubic hair. You can''t help but watch her, she is just too adorable to resist. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-			gs 'arousal', 'voyeur', 3
+			'You glance at Lariska as she finishes drying herself off, wrapping her hair in a towel before bundling it around her head. Tall and lanky with narrow hips, plus small perky breasts that easily fit into a sports bra, she''s definitely got a classic runner''s build. Which is a little weird since you''re pretty sure she plays volleyball. You also can''t help but notice that she keeps her bush trimmed and tidy.'
+			*nl
+			'Letting your gaze wander past her, you turn back to your own locker before anybody catches you staring and reach for your clothes.'
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Lina':
 			*clr & cla
-			pcs_horny += 5
-			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/linpeek.jpg"></center>'
-			'You notice Lina starting to get dressed. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you agree. She is slightly more athletic looking than most girls, but not by much. She has average breasts and a neatly trimmed triangle for a bush. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-			gs 'arousal', 'voyeur', 3
+			'You take a peek at Lina as she starts to pull her thigh high''s on. Slightly more athletic looking than most girls, she has average sized breasts and a neatly trimmed triangle between her legs. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact most boys in school think she''s pretty and you''re inclined to agree. Not sure you have any other adjectives to use for her though. Not for her body anyways...'
+			*nl
+			'After a few moments, you look away, not wanting to get caught staring and sucked into an awkward conversation.'
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
@@ -1637,76 +1677,81 @@ if $ARGS[0] = 'post_shower2':
 	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_shower2'
 	menu_off = 0
-	pcs_horny += 5
-	pcs_mood += 10
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphyssho<<rand(1,7)>>.jpg"></center>'
-	'Before leaving, you pause a moment by the door and casually glance back at the other girls who are still showering, pretending to be unsatisfied with your shave so you can check out their naked bodies. Several of them are really good looking and you can feel yourself getting aroused as you watch them lathering up their wet, nubile, naked bodies. Biting your lip, you give a particularly pretty girl a final long, lingering glance, before going back to the locker room to dry your hair and get dressed. You don''t think anyone noticed you watching them.'
-	'You grab your towel and diligently dry off your body. With your hair still wet, you wrap the towel around you, ready to return to the locker room and put that blow dryer to use.'
-	gs 'arousal', 'voyeur', 2
-	gs 'stat'
+	'All finished scrubbing, you begin to rinse the soap off, glancing at towards the other girls as you do. Most of them are doing the same as you, quietly cleaning up after gym class, letting the hot water pour over them or soaping up. A few of them are chattering between themselves, teasing or complimenting each other''s bodies.'
 	act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	act 'Check out Anushka':
 		*clr & cla
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nushwatch.jpg"></center>'
-		'You notice Anushka drying herself off with a towel. She is very pretty, some would even call her beautiful, but you know most of the boys follow her around with their tongues hanging out, especially if they are into alternative looks and tattoos. She has a petite build. Not too skinny, but just about right. She has average sized perky breasts while her pussy is clean shaven. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
+		'Your attention homes in on Anushka, who has already finished her shower and is drying herself off. She has a petite build, a variety of tattoos large and small covering her body. Not too skinny, but just about right. Her breasts look to be a solid B or maybe a small C and very perky. Her pussy is completely smooth, you imagine she must have just shaved today or shaves every day for it to look like that.'
+		*nl
+		'Perhaps sensing your gaze, Anushka suddenly turns her head over her shoulder, catching you peeking at her. You freeze, eyes going wide and your mouth going slack, trying to think of some kind of excuse. But before you can say anything, she winks and waggles her ass at you, before striding out of the room towards the lockers as if nothing happened at all. Letting out a breath you didn''t know you were holding, you shake your head and turn off the faucet, heading back to your locker so you can get dressed.'
+		gs'arousal','erotic_nudity', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Aylona':
 		*clr & cla
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch1.jpg"></center>'
-		'You notice Aylona soaping up her naked wet body, her hands rubbing all over her curves. She is kind of cute. No one would call her beautiful, but you know most of the boys think she is cute, especially if they are into alternative looks and tattoos. She is pretty skinny, maybe too skinny, giving her an almost starved look. She has small perky breasts while her bush is neatly trimmed in a triangle. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
+		'Your attention homes in on Aylona as she soaps herself up. Her body is incredibly thin, all skin, bones, and tattoos, almost anorexic. But as a result she has a flat tummy and not a single gram of cellulite in her thighs. Your attention is drawn to her small but perky breasts as she soaps them up. By the way they jiggle under her hands, they must be very soft. Between her legs is a neatly trimmed triangle of carpet that matches the drapes.'
+		*nl
+		'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
+		gs'arousal','erotic_nudity', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Albina':
 		*clr & cla
 		checkoutalbina = 1
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-		'You notice Albina soaping up her naked wet body, her hands rubbing all over her curves. She has a toned dancer build - thin with defined muscles and small perky breasts, complimented by a smoothly waxed pussy as well as a large, firm looking ass. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
+		
+		if tits < 2:
+			'Your attention homes in on Albina, eyes closed as water rains over her head and pours down her face. Her wet body is well toned without even a single excess gram of fat, skin silky smooth from her face to her toes, even between her shapely legs with a cleanly waxed pussy. Not to mention her bubblicious ass that''s the envy of every girl in the school. It''s clear as to why so many boys consider her to be the most attractive girl in your class. The only thing point of contention between them is her relatively small chest. Some of the guys don''t think her breasts are big enough to be the "hottest girl in school." Upon inspection, you realize they''re probably not even that small and they have a great supple shape to them. They''re certainly bigger than yours at any rate. But you''ve got one of the smallest busts in class. Maybe you''re not the best point of reference for what''s big and what''s not...'
+		elseif tits = 2:
+			'Your attention homes in on Albina, eyes closed as water rains over her head and pours down her face. Her wet body is well toned without even a single excess gram of fat, skin silky smooth from her face to her toes, even between her shapely legs with a cleanly waxed pussy. Not to mention her bubblicious ass that''s the envy of every girl in the school. It''s clear as to why so many boys consider her to be the most attractive girl in your class. The only thing point of contention between them is her relatively small chest. Some of the guys don''t think her breasts are big enough to be the "hottest girl in school." Upon inspection, you realize they''re probably not even that small, about the same size as your own. And they''ve got great shape too, just the right combination of firmness and softness. But compared to your classmates (who are a bit bigger on average) she''s still got one of the smaller busts in the class, so it''s only natural she''d stack up poorly in direct comparison.'
+		else
+			'Your attention homes in on Albina, eyes closed as water rains over her head and pours down her face. Her wet body is well toned without even a single excess gram of fat, skin silky smooth from her face to her toes, even between her shapely legs with a cleanly waxed pussy. Not to mention her bubblicious ass that''s the envy of every girl in the school. It''s clear as to why so many boys consider her to be the most attractive girl in your class. The only thing point of contention between them is her relatively small chest. Some of the guys don''t think her breasts are big enough to be the "hottest girl in school." Upon inspection, you realize they''re probably not even that small, still a solid B-cup. And they''re they''ve got great shape too, just the right combination of firmness and softness. But compared to you and your classmates who are a bit bigger on average, she''s still got one of the smaller busts in your grade, so it''s to be expected she''d stack up poorly in direct comparison.'
+		end
+		*nl
+		'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
+		gs'arousal','erotic_nudity', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Christina':
 		*clr & cla
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch3.jpg"></center>'
 		if christinaQW['dompath'] >= 7:
-			'You notice Christina soaping up her naked wet body, her hands rubbing all over her curves. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landing strip. Ever since you beat her up, you keep an eye on her, making sure she cannot try and hurt anybody else.'
+			'Your attention homes in on Christina as someone calls her name and she turns to look at them. You''ve been keeping an eye on her since your little tussle, making sure she doesn''t cause any trouble. While she''s distracted by conversation, you take the opportunity to survey her from head to toe. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs which look to die for. In combination with her very busty chest and a neat landing strip between her legs, her figure is rather pleasing, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine promoting some kind of new home workout.'
+			*nl
+			'"Yeah, just leave it in my locker," she replies to the girl talking to her. When she turns back she looks directly at you by mistake and realizes you''ve been watching her. You give her a look and she reluctantly turns back to her shower, closing her eyes and drowning her face in the water. Nodding in satisfaction, you turn off your own faucet and grab a towel, drying yourself off on the way back to your locker.'
 		else
-			'You notice Christina soaping up her naked wet body, her hands rubbing all over her curves. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landing strip. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
-		gs 'stat'
+			'Your attention homes in on Christina as someone calls her name and she turns to look at them. While she''s distracted by conversation, you take the opportunity to survey her from head to toe. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs which look to die for. In combination with her very busty chest and a neat landing strip between her legs, her figure is rather pleasing, if not conventionally attractive. You could easily imagine her on the cover of a sports magazine promoting some kind of new home workout.'
+			*nl
+			'"Yeah, just leave it in my locker," she replies to the girl talking to her and begins to turn towards you. Not wanting to get caught peeping, you turn around at the same time and shut off the faucet. It''s time to get dressed anyways. Grabbing a towel, you walk back to your locker, wiping yourself dry on the way.'
 		end
+		
+		gs'arousal','erotic_nudity', 3
+		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Lariska':
 		*clr & cla
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch4.jpg"></center>'
-		'You notice Lariska soaping up her naked wet body, her hands rubbing all over her curves. No one would call her beautiful, but you know most of the boys think she is cute. She has a runners build - thin and taller than average, with slightly defined muscles. She has small, perky breasts, and neatly trimmed pubic hair. You can''t help but watch her, she is just too adorable to resist. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
+		'Your attention homes in on Lariska, letting the water from the shower pour over her head, rinsing the suds from her body. Tall and lanky with narrow hips, plus small perky breasts that easily fit into a sports bra, she''s definitely got a classic runner''s build. Which is a little weird since you''re pretty sure she plays volleyball. The streams of water running down her belly draws your eyes between her legs, soap collecting and washing through the natural filter of her neatly trimmed bush.'
+		*nl
+		'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
+		gs'arousal','erotic_nudity', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Lina':
 		*clr & cla
-		pcs_horny += 5
-		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch1.jpg"></center>'
-		'You notice Lina soaping up her naked wet body, her hands rubbing all over her curves. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you agree. She is slightly more athletic looking than most girls, but not by much. She has average breasts and a neatly trimmed triangle for a bush. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
-		gs 'arousal', 'voyeur', 3
+		'Your attention homes in on Lina as she soaps herself up. Slightly more athletic looking than most girls, she has average sized breasts and a neatly trimmed triangle between her legs, highlighted by the soap suds collecting in it. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact most boys in school think she''s pretty and you''re inclined to agree. Not sure you have any other adjectives to use for her though. Not for her body anyways...'
+		*nl
+		'After a few moments of observation, decide you''ve looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.'
+		gs'arousal','erotic_nudity', 3
 		gs 'stat'
 		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
@@ -1750,7 +1795,7 @@ if $ARGS[0] = 'dress':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/les<<rand(1,3)>>.jpg"></center>'
 			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across a couple of girls making out... and, sure enough, when you peek around the next corner, you spy two girls you don''t know making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
-			gs 'arousal', 'voyeur', 3
+			gs'arousal','erotic_nudity', 3
 			gs 'stat'
 			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
 			act 'Masturbate':
@@ -1905,7 +1950,7 @@ if $ARGS[0] = 'post_dress':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokecig.jpg"></center>'
 			'You feel the need to have a smoke before you leave school, so you take out your pack of smokes. You pull a cigarette out, placing it between your lips before lighting it up and taking a long drag. You spend the next few minutes smoking your cigarette, feeling it relax you. Once finished, you snuff it out and throw the butt into one of the toilets.'
-			gt 'gschool_lessons4', 'post_dress'
+			act'Continue':gt 'gschool_lessons4', 'post_dress'
 		end
 	end
 	if joint >= 1:
@@ -1916,7 +1961,7 @@ if $ARGS[0] = 'post_dress':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokejoint.jpg"></center>'
 			'You feel the need to get high before you leave school, so you take a seat on one of the benches and take out a joint from your purse, placing it between your lips before lighting it up and taking a long drag. You can feel the effects quickly as you feel yourself relax and smile a bit. You spend the next few minutes smoking the joint until you are nice and high. Once you are done, you throw the roach in one of the toilets.'
-			gt 'gschool_lessons4', 'post_dress'
+			act'Continue':gt 'gschool_lessons4', 'post_dress'
 		end
 	end
 	act 'Use the mirror': gt 'mirror', 'start'

locations/katjaEv.qsrc

@@ -2018,7 +2018,7 @@ if $ARGS[0] = 'kathan10':
 
 		else
 			'You both change in the lockers, but before Katja can put on her bikini, you grab it.'
-			'"Hey! What are you doing? This isn''t fun"'
+			'"Hey! What are you doing? This isn''t funny!"'
 			'Smiling, you look at her, ogling the petite doll-like ginger that is desperately trying to cover her body.'
 			'"No Katja! This is going to be better for your skin! So... let it go!"'
 			'Without expecting a reply from the angry girl, you exit the lockers. She stands there a moment before reluctantly following you, and after waiting for your turn, enter the sauna.'

locations/masseuse_schedule.qsrc

@@ -2,76 +2,48 @@
 
 
 if $ARGS[0] = 'schedule_reset':
-	masseuse['new_job_week'] = daystart + (8 - week)
+	i = 1
 	if masseuse['shifts_required'] = 5:
-		masseuse['7_shift_1_taken'] = rand(0,2)
-		masseuse['7_shift_2_taken'] = rand(0,2)
-		masseuse['7_shift_3_taken'] = rand(0,2)
-		
-		masseuse['6_shift_1_taken'] = rand(0,2)
-		masseuse['6_shift_2_taken'] = rand(0,2)
-		masseuse['6_shift_3_taken'] = rand(0,2)
-		
-		masseuse['5_shift_1_taken'] = rand(0,2)
-		masseuse['5_shift_2_taken'] = rand(0,2)
-		masseuse['5_shift_3_taken'] = rand(0,2)
-		
-		masseuse['4_shift_1_taken'] = rand(0,2)
-		masseuse['4_shift_2_taken'] = rand(0,2)
-		masseuse['4_shift_3_taken'] = rand(0,2)
-		
-		masseuse['3_shift_1_taken'] = rand(0,2)
-		masseuse['3_shift_2_taken'] = rand(0,2)
-		masseuse['3_shift_3_taken'] = rand(0,2)
-		
-		masseuse['2_shift_1_taken'] = rand(0,2)
-		masseuse['2_shift_2_taken'] = rand(0,2)
-		masseuse['2_shift_3_taken'] = rand(0,2)
-		
-		masseuse['1_shift_1_taken'] = rand(0,2)
-		masseuse['1_shift_2_taken'] = rand(0,2)
-		masseuse['1_shift_3_taken'] = rand(0,2)
-		
+		:loop_masseuse_sched_part
+		if masseuse['<<i>>_shift_1'] ! 1:
+			masseuse['<<i>>_shift_1'] = 0
+			masseuse['<<i>>_shift_1_taken'] = rand(0,2)
+		end
+		if masseuse['<<i>>_shift_2'] ! 1: 
+			masseuse['<<i>>_shift_2'] = 0
+			masseuse['<<i>>_shift_2_taken'] = rand(0,2)
+		end
+		if masseuse['<<i>>_shift_3'] ! 1: 
+			masseuse['<<i>>_shift_3'] = 0
+			masseuse['<<i>>_shift_3_taken'] = rand(-1,2)
+		end
+		i += 1
+		if i < 8: jump 'loop_masseuse_sched_part'
 	elseif masseuse['shifts_required'] = 10:
-	
-		masseuse['7_shift_1_taken'] = rand(-3,2)
-		masseuse['7_shift_2_taken'] = rand(-3,2)
-		masseuse['7_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['6_shift_1_taken'] = rand(-3,2)
-		masseuse['6_shift_2_taken'] = rand(-3,2)
-		masseuse['6_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['5_shift_1_taken'] = rand(-3,2)
-		masseuse['5_shift_2_taken'] = rand(-3,2)
-		masseuse['5_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['4_shift_1_taken'] = rand(-3,2)
-		masseuse['4_shift_2_taken'] = rand(-3,2)
-		masseuse['4_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['3_shift_1_taken'] = rand(-3,2)
-		masseuse['3_shift_2_taken'] = rand(-3,2)
-		masseuse['3_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['2_shift_1_taken'] = rand(-3,2)
-		masseuse['2_shift_2_taken'] = rand(-3,2)
-		masseuse['2_shift_3_taken'] = rand(-3,2)
-		
-		masseuse['1_shift_1_taken'] = rand(-3,2)
-		masseuse['1_shift_2_taken'] = rand(-3,2)
-		masseuse['1_shift_3_taken'] = rand(-3,2)
+		:loop_masseuse_sched_full
+		if masseuse['<<i>>_shift_1'] ! 1: 
+			masseuse['<<i>>_shift_1'] = 0
+			masseuse['<<i>>_shift_1_taken'] = rand(-3,2)
+		end
+		if masseuse['<<i>>_shift_2'] ! 1: 
+			masseuse['<<i>>_shift_2'] = 0
+			masseuse['<<i>>_shift_2_taken'] = rand(-3,2)
+		end
+		if masseuse['<<i>>_shift_3'] ! 1: 
+			masseuse['<<i>>_shift_3'] = 0
+			masseuse['<<i>>_shift_3_taken'] = rand(-3,2)
+		end
+		i += 1
+		if i < 8: jump 'loop_masseuse_sched_full'
 	end
-	gt'masseuse_schedule','start'
 end
 
 
 if $ARGS[0] = 'start':
 
 	act'Finish scheduling':gt'salon','start'
-	
-    if masseuse['new_job_week'] <= daystart: gt'masseuse_schedule','schedule_reset'
-
+	if masseuse['schedule_update'] = 0: masseuse['schedule_update'] = daystart & gs 'masseuse_schedule','schedule_reset'
+	gs 'stat'
 	'<Table border=1><TR><TH>Sunday</TH> <TH>Monday</TH> <TH>Tuesday</TH> <TH>Wednesday</TH> <TH>Thursday</TH> <TH>Friday</TH> <TH>Saturday</TH></TR>'
 
 !! ---------------------------------------------- 09:00 Shifts ---------------------------------------------------------------------------------
@@ -83,6 +55,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['7_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['7_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -96,6 +71,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['1_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['1_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -109,6 +87,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['2_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['2_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -122,6 +103,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['3_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['3_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -135,6 +119,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['4_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['4_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -148,6 +135,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['5_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['5_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -161,6 +151,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['6_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['6_shift_1'] = 2:
+		'09:00-13:00 shift'
+		'<i>already worked</i>'
 	else
 		'09:00-13:00 shift'
 		'<a href="exec:masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -177,6 +170,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['7_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['7_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -190,6 +186,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['1_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['1_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -203,6 +202,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['2_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['2_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -216,6 +218,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['3_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['3_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -229,6 +234,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['4_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['4_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -242,6 +250,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['5_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['5_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
 		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -255,8 +266,11 @@ if $ARGS[0] = 'start':
 	elseif masseuse['6_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['6_shift_2'] = 2:
+		'13:00-17:00 shift'
+		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		'13:00-17:00 shift'
 		'<a href="exec:masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
@@ -271,6 +285,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['7_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['7_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -284,6 +301,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['1_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['1_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -297,6 +317,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['2_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['2_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -310,6 +333,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['3_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['3_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -323,6 +349,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['4_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['4_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -336,6 +365,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['5_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['5_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -349,6 +381,9 @@ if $ARGS[0] = 'start':
 	elseif masseuse['6_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
+	elseif masseuse['6_shift_3'] = 2:
+		'17:00-21:00 shift'
+		'<i>already worked</i>'
 	else
 		'17:00-21:00 shift'
 		'<a href="exec:masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
@@ -357,8 +392,4 @@ if $ARGS[0] = 'start':
 	
 end
 
-
-!! --------------------------------------------------------------- Ignore Everything Past This Line -----------------------------------------------------------------------------
-
-
 --- masseuse_work ---------------------------------

locations/masseuse_work.qsrc

@@ -36,7 +36,9 @@ if $ARGS[0] = 'shift_end':
 	gs 'arousal','end'
 	if robe = 0:robe = 1
 	salon['work_minutes'] = 0
-	masseuse['<<week>>_shift_<<masseuse_shift>>'] = 0
+	masseuse['<<week>>_shift_<<masseuse_shift>>'] = 2
+	masseuse['last_worked_day'] = daystart
+	masseuse['last_worked_hour'] = hour
 	money += massage['shift_tips']
 	massage['shift_tips'] = 0
 	salon['work_minutes'] = 0
@@ -104,8 +106,12 @@ if $ARGS[0] = 'last_client':
 		elseif cumloc[0] = 0 and cumloc[11] = 0:
 			act'Get ready for the next shift':gt'masseuse_work','shift_start'
 		end
-	else		
-		'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day.'
+	else
+		if minut < 10:
+			'<b><<hour>>:0<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day.'
+		else
+			'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day.'
+		end
 		*nl
 		if cumloc[0] > 0 or cumloc[11] > 0:
 			'The only question left is if you''re going to clean yourself up first.'

locations/pav_park.qsrc

@@ -98,11 +98,11 @@ if $ARGS[0] = 'start':
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pav_commercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pav_residential''">residential</a> area.'
-	if ((month > 7 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 0: 
+	if ((month = 8 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 0: 
 		'<br>You overhear someone speaking in front of a crowd. The crowd is quite rowdy, with lots of yelling and clapping throughout the <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_1''">meeting</a>.'
-	elseif ((month > 8 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 1 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart:
+	elseif ((month = 9 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 1 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart:
 		'Once again a large crowd has gathered in the town center. You can hear Albina''s father holding a public <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_2''">meeting</a>.'
-	elseif ((month > 9 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart and AlbinaQW['StarletsJoined'] = 0:
+	elseif ((month = 10 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart and AlbinaQW['StarletsJoined'] = 0:
 		'By this time you''re well aware that it''s Albina''s father that is holding a <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_3''">meeting</a>, this time though they have erected a big stage.'
 	end
 	

locations/salon.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	if ((masseuse['<<week>>_shift_1'] = 1 and hour = 9) or (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17)) and masseuse['uniform'] ! 1:
 		masseuse['weeks_pay'] -= 1
 		'"Hey!" Xian yells at you from the front desk. "You''re late! You''re being docked an hour''s pay for that! Now get changed and get in there!"'
-	elseif (masseuse['<<week>>_shift_1'] = 1 and hour > 9) or (masseuse['<<week>>_shift_2'] = 1 and hour > 13) or (masseuse['<<week>>_shift_3'] = 1 and hour > 17) or masseuse['missed_shift2'] > 0:
+	elseif (masseuse['<<week>>_shift_1'] = 1 and hour > 9 and masseuse['last_worked_day'] ! daystart) or (masseuse['<<week>>_shift_2'] = 1 and hour > 13 and masseuse['last_worked_day'] ! daystart) or (masseuse['<<week>>_shift_3'] = 1 and hour > 17 and (masseuse['last_worked_day'] ! daystart or (masseuse['last_worked_day'] = daystart and masseuse['last_worked_hour'] ! hour))) or masseuse['missed_shift2'] > 0:
 		'"Hey! You missed your shift! What the hell is wrong with you?"'
 		if masseuse['<<week>>_shift_1'] = 1 and hour > 9:
 			masseuse['<<week>>_shift_1'] = 2
@@ -32,8 +32,9 @@ if $ARGS[0] = 'start':
 		elseif masseuse['<<week>>_shift_3'] = 1 and hour > 17:
 			masseuse['<<week>>_shift_3'] = 2
 		end
+		masseuse['missed_shift'] += masseuse['missed_shift2']
 		masseuse['missed_shift2'] = 0
-		masseuse['missed_shift'] += 1
+		
 	end
 	act 'Leave':
 		if masseuse['uniform'] = 1:
@@ -492,6 +493,7 @@ end
 !!	Masseuse Job Stuff
 !!-------------------------------------------------------------------------------------------------------------------------------
 if $ARGS[0] = 'masseuse_orientation':
+	masseuse['hired_day'] = daystart
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
 	'You scribble out a signature and she takes the paper back from you.'
 	'"Thank you very much! So for future reference, I''m Xian, one of the managers here. All your clients will come to me and will be able to request you based on whether you are available or not. Now if you''ll quickly follow me," she gets up from her chair and moves around the desk towards the back.'
@@ -567,7 +569,7 @@ end
 if $ARGS[0] = 'questions':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
-	'"Pay day is Friday. You can pick it up from me any time on that day. Do you have any questions?"'
+	'"We schedule who''s working every Sunday so be sure to come in then to set your hours. Pay day is Friday. You can pick it up from me any time on or after that day.  Do you have any questions?"'
 	act'No more questions':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
@@ -841,20 +843,27 @@ if $ARGS[0] = 'payday':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
 	'"I''m here to pick up my pay for this week Xian."'
 	'"Okay!" She opens up a drawer and thumbs through a few different labels before reaching into one and picking up an envelope. She hands it over to you.'
-	if masseuse['shifts_worked'] < masseuse['shifts_required']:
+	if masseuse['hired_day'] <= daystart - 7:
+	
+	!!	gs'salon','first_week'
+	elseif masseuse['shifts_worked'] < masseuse['shifts_required']:
+		masseuse['warning'] - 1
 		'"Hey, you only worked <<masseuse[''shifts_worked'']>> this week. You were supposed to work <<masseuse[''shifts_required'']>>."'
 		'"Sorry," you say, reaching for the envelope. "Won''t happen again."'
 		'"Better not." You try to pull the envelope away but Xian holds on tight to it, not budging until you make eye contact. "<<masseuse[''warning'']>> more times and you''re fired."'
 		*nl
 		'She lets go.'
 	elseif masseuse['shifts_worked'] >= masseuse['shifts_required']:
-		masseuse['shifts_worked'] = 0
 		if masseuse['shifts_worked'] > masseuse['shifts_required']:
-			'"By the way, thanks for covering those extra shifts this week <<$pcs_firstname>>! Really helpful for us."'
-			'"No problem, I wanted the money," you say, taking the envelope.'
+			'"By the way, thank you for covering those extra shifts this week <<$pcs_firstname>>. Really helpful for us."'
+			'"No problem Xian," you say, taking the envelope. "I could use the extra cash."'
 		end
-	end
-	
+	end	
+	gs 'salon','payday_end'
+	act'Leave':gt'salon','start'
+end
+
+if $ARGS[0] = 'payday_end':
 	'Looking inside, you see it''s stuffed with cash that counts out to <<masseuse[''paycheck'']>> <b>₽</b>.'
 	money += masseuse['paycheck']
 	masseuse['money_earned'] += masseuse['paycheck']
@@ -866,7 +875,7 @@ if $ARGS[0] = 'payday':
 	masseuse['payday'] = 0
 	masseuse['weeks_pay'] = 0
 	masseuse['paycheck'] = 0
-	act'Leave':gt'salon','start'
+	masseuse['shifts_worked'] = 0
 end
 
 if $ARGS[0] = 'rehire1':
@@ -1822,6 +1831,23 @@ if $ARGS[0] = 'massage':
 	end
 end
 
+if $ARGS[0] = 'massage_explain':
+	*nl
+	'"For women we have several types of massages.'
+	*nl
+	'First off, we have your <b>standard body massage</b>, guaranteed to leave you feeling relaxed and refreshed.'
+	*nl
+	'Then we also have a <b>special wellness massage</b>. Very relaxing as well and with the use of special oils will leave you feeling younger and delay the aging process of your skin.'
+	*nl
+	'There is also the <b>magic finger massage</b>, which relaxes you in a different way. Designed to release tension from your body, it will have you moaning for the entire session we''re sure of it. It has very <i>climactic</i> results.'
+	*nl
+	'We also have a <b>throat massage for those who have a bit of an oral fixation. Helps to satisfy the need to suck on something. Comes with a complimentary cocktail or facial, whichever you choose.'
+	*nl
+	'We have the <b>hardcore massage</b> and the <b>double hardcore massage</b>. The hardcore massage is there to quite literally pound the stress from your body. Our massage therapists are extremely skilled when it comes to relieving stress in this manner. A double hardcore massage is simply adding one more person. Instead of a single massage therapist, two of them will simultaneously pound you for maximum stress relief.'
+	*nl
+	'Lastly, we have a <b>gentle massage</b>. Not everybody likes it hard, so we have a more gentle version as well that should fill your needs quite nicely if you are inclined.'
+end
+
 if $ARGS[0] = 'massage_end':
 	gs 'clothing', 'wear_last_worn'
 	gs 'underwear', 'wear'

locations/sister_chat.qsrc

@@ -1230,5 +1230,47 @@ if $ARGS[0] = 'pargone':
 	act 'Move away': gt $loc, $loc_arg
 end
 
+if $ARGS[0] = 'bathroom_dildo_talk1':
+	if anyaQW['bathroom_dildos_again'] > 0:gt'sister_chat','bathroom_dildo_talk2'
+	anyaQW['bathroom_dildos_again'] += 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+	*nl
+	if anyaQW['bathroom_dildos'] = 1:
+		'As you open the door to your room and something suddenly comes flying towards you. You jump in surprise and flail, scrambling to catch the incoming projectile. Somehow, you manage to not drop it, only at that point realizing that it''s a rubber dick with a suction cup on the end of it. Wait, isn''t this yours???'
+	else
+		'As you open the door to your room something suddenly comes flying towards you. You jump in surprise and flail, scrambling to catch the incoming projectiles. Somehow, you manage to not drop them, only at that point realizing that they''re two rubber dicks with suction cups at the ends. Wait, aren''t these yours???'
+	end
+	act'Continue':
+		suction_dildo = anyaQW['bathroom_dildos']
+		anyaQW['bathroom_dildos'] = 0
+		*clr & cla
+		'<center><h1><font color="maroon">Anya</font></h1></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+		if anyaQW['bathroom_dildos'] = 1:
+			'"I found that that stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know it''s not mine and I don''t think Kolka''s into that kind of thing so I assumed it must be yours. Don''t leave that laying around! If mom found it, she''d have beat your ass!"'
+		else
+			'"I found those stuck to the tub when I went in earlier." You look up and see Anya sitting on her bed looking at you. "I know they''re not mine and I don''t think Kolka''s into that kind of thing so I assumed they must be yours. Don''t leave those around! If mom found them, she''d have beat your ass!"'
+		end
+		act'Continue':gt'bedrPar'
+	end
+end
+
+if $ARGS[0] = 'bathroom_dildo_talk2':
+	suction_dildo = anyaQW['bathroom_dildos']
+	anyaQW['bathroom_dildos'] = 0
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+	*nl
+	if anyaQW['bathroom_dildos'] = 1:
+		'Opening the door to your room, you gasp in shock as two rubber cocks come flying at your head and you barely manage to catch them.'
+		'"<<$pcs_nickname>>!" your sister hisses. "Seriously! Mom is going to <i>kill</i> you if you aren''t more careful! Don''t leave these in the tub after you''re done!"'
+	else
+		'Opening the door to your room, you gasp in shock as a rubber cock comes flying at your head and you barely manage to catch it.'
+		'"<<$pcs_nickname>>!" your sister hisses. "Seriously! Mom is going to <i>kill</i> you if you aren''t more careful! Don''t leave this in the tub after you''re done!"'
+	end
+	act'Continue':gt'bedrPar'
+end
+
 --- sister_chat ---------------------------------
 

locations/soniadisco.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'disco0':
 		if soniafall < 3:
 			gs 'soniadisco', 'watchorhelp'
 		else
-			gs 'soniadisco', 'soniashowboobs'
+			gs 'soniadisco', 'soniashowsboobs'
 		end
 	end
 end