Forráskód Böngészése

Merge remote-tracking branch 'master/master'

anjuna krokus 6 hónapja
szülő
commit
933070f6ea

+ 12 - 0
locations/boy_updater.qsrc

@@ -144,6 +144,18 @@ if $ARGS[0] = 'schedule_update':
 	end
 end
 
+if $ARGS[0] = 'trait_updates':
+	if $npc_rel_goal[$boy] = '':
+		if npc_goal[$boy] = 1:
+			$npc_rel_goal[$boy] = 'sex'
+		elseif npc_goal[$boy] = 2:
+			$npc_rel_goal[$boy] = 'casual'
+		elseif npc_goal[$boy] = 3:
+			$npc_rel_goal[$boy] = 'serious'
+		end
+	end
+end
+
 if $ARGS[0] = 'unique_NPC_stat_seed':
 	if $boy = 'A11':
 		

+ 6 - 0
locations/fertility.qsrc

@@ -268,9 +268,15 @@ if $ARGS[0] = 'update':
 	end
 
 	if pillcon2 > 26000:
+		if tabletkishot > 0 and $birth_control['type'] ! 'shot':
+			$birth_control['type'] = 'shot'
+		elseif $birth_control['type'] ! 'pill':
+			$birth_control['type'] = 'pill'
+		end
 		birth_control['think_safe'] = 1
 	elseif placebopart <= 0:
 		birth_control['think_safe'] = 0
+		$birth_control['type'] = 'none'
 	end
 end
 

+ 6 - 90
locations/gschool_lessons4.qsrc

@@ -771,13 +771,8 @@ if $ARGS[0] = 'pe':
 						act 'Look':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nushtopless.jpg"></center>'
-<<<<<<< Updated upstream
-							'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 stays alongside you for most of the run and a few boys pass by, slowing down to take a good look. Some of the girls look as well, but most just give dirty or disgusted looks to Anushka.'
-							gs 'arousal', 'erotic_nudity', 5
-=======
 							'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, her small breasts bouncing with every step she takes. She notices where your eyes drift and grins. She stays alongside you for most of the run and a few boys pass by, slowing down to take a good look. Some of the girls look as well, but most just give her dirty or disgusted looks.'
 							gs 'arousal','erotic_nudity', 5
->>>>>>> Stashed changes
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finish your run': gt 'gschool_lessons4', 'postphys'
@@ -804,13 +799,8 @@ if $ARGS[0] = 'pe':
 					if runinside = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/butt.jpg"></center>'
 						'"The weather isn''t great, so you''ll be running as many laps of the gym as you can. Start when you''re ready."'
-<<<<<<< Updated upstream
-					    'You start running laps around the inside of the gym and it''s uneventful until you see Anushka pass behind Coach Nikolaevich and pull 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', 'erotic_nudity', 5
-=======
 						'You start running laps around the inside of the gym and it''s uneventful until you see Anushka pass behind Coach Nikolaevich and pull 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','erotic_nudity', 5
->>>>>>> Stashed changes
 						gs 'arousal', 'end'
 						gs 'stat'
 					else
@@ -1207,15 +1197,9 @@ if $ARGS[0] = 'shower2':
 	gymshower = rand(1,10)
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/shower/showerspank.mp4"></video></center>'
-<<<<<<< Updated upstream
 		'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 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, but you do hear Bella talking to Albina.'
 	    'As you wash off the soap, you turn in time to see Bella start spanking Albina; most of the girls stop what they''re doing to watch. After several fairly hard smacks that echo into the room, they stop and laugh about it as Albina rubs her ass with strange glee and Bella smiles and nods her head, seemingly in approval. You turn back and finish your shower as Bella and Albina giggle at each other.'
 		gs 'gschool_lessons4', 'shower_options'
-=======
-		'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''s unique to hot showers - after PE, this feels simply great. After spending a few minutes 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, but you do hear Bella talking to Albina.'
-	    'As you wash off the soap, you turn in time to see Bella start spanking Albina; most of the girls stop what they''re doing to watch. After several fairly hard smacks that echo into the room, they stop and laugh about it as Albina rubs her ass with strange glee. You turn back and finish your shower as Bella and Albina giggle at each other.'
-		gs'gschool_lessons4','shower_options'
->>>>>>> Stashed changes
 	elseif gymshower = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/picture.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''s unique to hot showers - after PE, this feels simply great. After spending a few minutes 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.'
@@ -1224,15 +1208,9 @@ if $ARGS[0] = 'shower2':
 	elseif gymshower = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/aylnushkiss.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 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.'
-<<<<<<< Updated upstream
 		*nl
 		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing. Katyusha even says "Stop that you fucking dykes! That''s so disgusting." Anushka looks to Katyusha, makes a V with her fingers and sticks her tongue between them wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to just showering.'
 		gs 'gschool_lessons4', 'shower_options'
-=======
-		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing.'
-		'"Stop that, you fucking dykes! That''s so disgusting!" Katyusha scowls, but Anushka looks at her, makes a V with her fingers and sticks her tongue between them wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to just showering.'
-		gs'gschool_lessons4','shower_options'
->>>>>>> Stashed changes
 	elseif gymshower = 4 and npc_grupTipe['A25'] = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_1.jpg"></center>'
 		'As you shower, you catch of a glimpse of Lena and Lera up to their usual tricks. Lera is on her knees with her face buried in Lena''s crotch, who is clearly enjoying herself. Several of the other girls give disgusted looks at what they''re seeing. As it''s something you''ve seen dozens of times before, you ignore them and go back to cleaning yourself, but are interrupted by Lena calling someone out. You turn to see her getting up in Sonia''s face, who has her fingers buried deep inside her pussy.'
@@ -1268,14 +1246,8 @@ if $ARGS[0] = 'shower2':
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
-<<<<<<< Updated upstream
 				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. You look up, and to your despair, see that it was Christina. "Let''s make it a party girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.'
 				'With no way to escape, you resign yourself to the humiliation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut." is all she says before another girl takes her place.'
-=======
-				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia.'
-				'You look up, and to your despair, see that it was Christina. "Let''s make it a party, girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.'
-				'With no way to escape, you resign yourself to the humilation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut," is all she says before another girl takes her place.'
->>>>>>> Stashed changes
 				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and quickly run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
 				gs 'stat'
@@ -1337,11 +1309,11 @@ if $ARGS[0] = 'shower2':
 		end
 	elseif gymshower >= 5 and gymshower <= 7:
 		if pcs_pubes >= 40:
-<<<<<<< Updated upstream
 			gt 'gschool_lessons4', 'pube_bully'
-=======
-			gt 'gschool_lessons4','pube_bully'
->>>>>>> Stashed changes
+		if pcs_pubes > 25:
+			gt'gschool_lessons4','pube_bully'
+		elseif grupTipe = 1 or grupTipe = 2:
+			gt'gschool_lessons4', 'pube_compliment'
 !!		elseif grupTipe = 4 or grupTipe = 2:
 !!			
 		else
@@ -1448,29 +1420,19 @@ if $ARGS[0] = 'whore_bully':
 		act 'Cry':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/nudepic.jpg"></center>'
-			'Caught in the midddle, you have no choice to but to keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
-<<<<<<< Updated upstream
+			'Caught in the middle, you have no choice to but to keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
 			*nl
-			'You finally reach the showerhead and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
-			gs 'gschool_lessons4', 'shower_options'
-=======
 			'You finally reach the shower head and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
 			gs 'gschool_lessons4','shower_options'
->>>>>>> Stashed changes
 		end
 		
 		act 'Fume':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/bully_slap1.jpg"></center>'
 			'Caught in the middle, you have no choice to but to keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
-<<<<<<< Updated upstream
 			*nl
-			'You finally reach the showerhead and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
-			gs 'gschool_lessons4', 'shower_options'
-=======
 			'You finally reach the shower head and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
 			gs 'gschool_lessons4','shower_options'
->>>>>>> Stashed changes
 		end
 	end
 	
@@ -1478,14 +1440,9 @@ if $ARGS[0] = 'whore_bully':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/bully_slap2.jpg"></center>'
 		'You do your best to ignore it and keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
-<<<<<<< Updated upstream
 		*nl
-		'You finally reach the showerhead and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
-		gs 'gschool_lessons4', 'shower_options'
-=======
 		'You finally reach the shower head and turn the faucet on, dousing your face. Hopefully, that way nobody will notice your tears...'
 		gs 'gschool_lessons4','shower_options'
->>>>>>> Stashed changes
 	end
 end
 
@@ -1632,14 +1589,9 @@ if $ARGS[0] = 'long_shower':
 				gs 'stat'
 				if checkoutalbina = 1:
 				    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-<<<<<<< Updated upstream
-					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She is happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s 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', 'erotic_nudity', 2
-=======
 					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She''s happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s saying anymore. As you finish drying your hair, 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','erotic_nudity', 2
->>>>>>> Stashed changes
 					gs 'stat'
 					act 'Yes':
 						*clr & cla
@@ -1658,11 +1610,7 @@ if $ARGS[0] = 'long_shower':
 						'You shake your head. "You''re very 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.'
-<<<<<<< Updated upstream
 						gs 'arousal', 'erotic_nudity', 2
-=======
-						gs 'arousal','erotic_nudity', 2
->>>>>>> Stashed changes
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Deny it':
@@ -1693,14 +1641,9 @@ if $ARGS[0] = 'long_shower':
 					end
 				elseif checkoutalbina = 1 and npc_sex['A23'] >= 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-<<<<<<< Updated upstream
-					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She is happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s 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', 'erotic_nudity', 2
-=======
 					'As you walk into the locker room, you can tell that it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She doesn''t sound very happy as she argues on the phone with her father.','She''s happily speaking on the phone with someone.')+' Once you start drying your hair, you can''t hear what she''s saying anymore. As you finish drying your hair, 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','erotic_nudity', 2
->>>>>>> Stashed changes
 					gs 'stat'
 					act 'Yes':
 						*clr & cla
@@ -1722,13 +1665,8 @@ if $ARGS[0] = 'long_shower':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 								'You pull away from her and step back. "What are you doing?"'
-<<<<<<< Updated upstream
 								'She gives you a confused stare. "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', 'erotic_nudity', 2
-=======
-								'She gives you a confused stare. "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''s done, she walks out, leaving you alone in the locker room.'
-								gs'arousal','erotic_nudity', 2
->>>>>>> Stashed changes
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1744,11 +1682,7 @@ if $ARGS[0] = 'long_shower':
 						'You shake your head. "You''re very 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.'
-<<<<<<< Updated upstream
 						gs 'arousal', 'erotic_nudity', 2
-=======
-						gs 'arousal','erotic_nudity', 2
->>>>>>> Stashed changes
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Deny it':
@@ -1757,13 +1691,8 @@ if $ARGS[0] = 'long_shower':
 							gs 'stat'
 							'<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''re in. I didn''t mean anything by it," you say while shaking your head.'
-<<<<<<< Updated upstream
 							'She just shrugs. "Whatever," she grumbles before she starts getting 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', 'erotic_nudity', 2
-=======
-							'She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she''s done, she walks out, leaving you alone in the locker room.'
-							gs'arousal','erotic_nudity', 2
->>>>>>> Stashed changes
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1788,13 +1717,8 @@ if $ARGS[0] = 'long_shower':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 									'You pull away from her and step back. "What are you doing?"'
-<<<<<<< Updated upstream
 									'She gives you a confused stare. "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', 'erotic_nudity', 2
-=======
-									'She gives you a confused stare. "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''s done, she walks out, leaving you alone in the locker room.'
-									gs'arousal','erotic_nudity', 2
->>>>>>> Stashed changes
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
@@ -1863,14 +1787,11 @@ if $ARGS[0] = 'long_shower_locker':
 	act 'Get dressed': gt 'gschool_lessons4', 'post_dress'
 end
 
+
 if $ARGS[0] = 'shower_watch_end':
 	cla & *nl
 	'After watching for a few more seconds, you 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.'
-<<<<<<< Updated upstream
 	gs 'arousal', 'erotic_nudity', 3
-=======
-	gs 'arousal','erotic_nudity', 3
->>>>>>> Stashed changes
 	gs 'stat'
 	act 'Go to the locker room': gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 end
@@ -1908,13 +1829,8 @@ if $ARGS[0] = 'dress':
 		act 'Take a peek':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/les<<rand(1,3)>>.jpg"></center>'
-<<<<<<< Updated upstream
 			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across some girls making out and, sure enough, when you peek around the next corner, you spy Lena and Lera 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', 'erotic_nudity', 3
-=======
-			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across some girls making out and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you''re 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','erotic_nudity', 3
->>>>>>> Stashed changes
 			gs 'stat'
 			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
 			act 'Masturbate':

+ 69 - 49
locations/gschool_lessonsev1.qsrc

@@ -202,23 +202,34 @@ if $ARGS[0] = 'biology':
 			'As you walk into class, you see some guys have drawn a goofy scene on the blackboard, making it look like they''re characters in a computer game. You share a laugh with them as you sit down; that certainly brightened your mood.'
 		elseif scooltiperand = 3:
 			pcs_mood -= 10
-			gs 'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -10
-				gs 'fame', 'pav', 'sex', 2
-				memories['school_no_panty_flash'] = daystart
+			gs'stat'
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy. Miss Orlov comes over to help you back up and block the view of your ass as best she can.'
-				'Once you''re back on your feet she takes you aside. "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
+				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that before class?" in an embarrassed and scandalized tone. "<i>Both holes?</i>"'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
-				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 3
-				memories['school_no_panty__anal_plug_flash'] = daystart
+				gs 'fame', 'pav', 'sex', rand(8,12)
+				pcs_memory['school_no_panty_anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard. While solving it, you accidentally drop the cloth and totally forget that not only are you are not wearing any panties, but also have a butt plug stuffed in your ass. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your classmates.'
 				'Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Miss Orlov sits, she can''t see what everyone is fussing over, so she starts to move to get a better look, but you quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				pcs_memory['school_no_panty_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov swiftly steps behind you, blocking the view of your ass as best she can, and softly whispers, "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
 			else
-				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow, you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. Miss Orlov comes over to help you back up and block their view of your ass as best she can. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
@@ -312,12 +323,7 @@ if $ARGS[0] = 'biology':
 								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-<<<<<<< Updated upstream
 								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
-=======
-								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris.'
-								'However, your bare pussy is just too tempting to resist and you soon abandon the pencil in favour of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
->>>>>>> Stashed changes
 								*nl
 								$orgasm_txt = 'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your legs clenching hard in orgasm. You bite your lip hard as you ride out the waves of pleasure and you feel Dan''s hand slide away as you notice Miss Orlov giving you a questioning look. With bright eyes and a confident smile, you quickly fix your clothes and sit up in your seat.'
 								$orgasm_or = 'yes'
@@ -426,11 +432,7 @@ if $ARGS[0] = 'biology':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 16:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natskirt.jpg"></center>'
-<<<<<<< Updated upstream
 			'Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty-clad ass as she sits through the rest of the class. Several other students notice as well.'
-=======
-			'Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done, Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty clad ass as she sits through the rest of the class. Several other students notice as well.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -637,22 +639,36 @@ if $ARGS[0] = 'science':
 		elseif scooltiperand = 3:
 			pcs_mood -= 10
 			gs 'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 2
-				memories['school_no_panty_flash'] = daystart
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy. Miss Orlov comes over to help you back up and block the view of your ass as best she can.' 
-				'Once you''re back on your feet, she takes you to one side. "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
+				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that before class?" in an embarrassed and scandalized tone. "<i>Both holes?</i>"'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 3
-				memories['school_no_panty__anal_plug_flash'] = daystart
+				gs 'fame', 'pav', 'sex', rand(4,8)
+				pcs_memory['school_no_panty__anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is also stuffed with a butt plug.'
+				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidentally drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is also stuffed with a butt plug.'
 				*nl
 				'"Is there a problem, Miss <<$pcs_lastname>>?" Miss Orlov asks curiously.'
 				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Miss Orlov sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up and adjust your skirt and, with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'arousal', 'flash', -5
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				pcs_memory['school_no_panty_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass as best she can. Once you are back on your feet she softly says "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1000,12 +1016,7 @@ if $ARGS[0] = 'computer':
 								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-<<<<<<< Updated upstream
 								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
-=======
-								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris.'
-								'However, your bare pussy is just too tempting to resist and soon you abandon the pencil in favour of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
->>>>>>> Stashed changes
 								*nl
 								$orgasm_txt = 'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much and your knees fly together, trapping your hand as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves of pleasure and you feel Vasily''s hand slide away as you notice Mr. Ivanov giving you a questioning look. With bright eyes and a confident smile, you quickly fix your clothes and sit up in your seat.'
 								$orgasm_or = 'yes'
@@ -1491,23 +1502,36 @@ if $ARGS[0] = 'russian':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 2
-				memories['school_no_panty_flash'] = daystart
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Yenotin poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy.'
-				'Everyone but Mr. Yenotin that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 3
-				memories['school_no_panty__anal_plug_flash'] = daystart
+				gs 'fame', 'pav', 'sex', rand(4,8)
+				pcs_memory['school_no_panty__anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
+				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidentality drop the cloth needed to wipe the board clean and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
 				'"Well?" Mr. Yenotin prods impatiently.'
-				'With a coy smile, you bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
-				'From where Mr. Yenotin sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Yenotin sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'arousal', 'flash', -5
+				gs 'fame', 'pav', 'sex', rand(1,5)
+				pcs_memory['school_no_panty_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mr. Yenotin that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flashlite', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1924,12 +1948,8 @@ if $ARGS[0] = 'russian':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 20:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/russian/paulpanties.jpg"></center>'
-<<<<<<< Updated upstream
-			'As class ends and everyone starts to get up, Pauline stops in front of Marcus, bends over and lifts her skirt to show him her panty-clad ass and wiggles it around. "That''s as close as any Russian girl will get to letting you touch them. It must be... hard... being so far from home Marcus." She teases him a bit more and gets a lot of laughs. He does his best to ignore it, but he can''t help himself from looking. Soon, it is over as she drops her skirt back in place and everyone leaves class.'
-=======
 			'As class ends and everyone starts to get up, Pauline stops in front of Marcus, bends over and lifts her skirt to show him her panty clad ass and wiggles it around. "That''s as close as any Russian girl will get to letting you touch them. It must be... Hard being so far from home."'
 			'She teases him a bit more and gets a lot of laughs. He does his best to ignore it, but he can''t help himself from looking.'
->>>>>>> Stashed changes
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'

+ 110 - 88
locations/gschool_lessonsev2.qsrc

@@ -16,20 +16,34 @@ if $ARGS[0] = 'geography':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
-			gs 'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 3
-				memories['school_no_panty_flash'] = daystart
+			gs'stat'
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 5
-				memories['school_no_panty__anal_plug_flash'] = daystart
+				gs 'fame', 'pav', 'sex', rand(8,12)
+				pcs_memory['school_no_panty__anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard, but while solving it, you accidentally drop the cloth. You totally forget that not only are you are not wearing panties, your ass is stuffed with a butt plug. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
-				'From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
+				'You''ve been called up to answer the question written on the blackboard, but while solving it, you accidentally drop the cloth used to wipe the board. You totally forget that not only are you are not wearing panties, your ass is stuffed with a butt plug. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'arousal', 'flash', -5, 'exhibitionism'
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				pcs_memory['school_no_panty_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -387,13 +401,29 @@ if $ARGS[0] = 'math':
 		if scooltiperand = 1:
 			pcs_mood -= 10
 			gs 'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 3
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Mr. Tsarev calls you up to the blackboard to answer a question. As you solve the problem, you drop the chalk on the floor and quickly bend over to pick it up, having forgot that you aren''t wearing any panties and giving everyone a clear view of your holes. The boys start whistling and hollering while many of the girls whisper at each other.'
-				'"Damn <<$pcs_nickname>>, you certainly know how how to put on a show!" Dimka laughs.'
-				'"Yeah, you have some nice holes there, <<$pcs_nickname>>," Igor adds.'
+				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+				end
+			elseif $pantyworntype = 'none' and analplugin = 1:
+				gs 'arousal', 'flash', -5, 'exhibitionism'
+				gs 'fame', 'pav', 'sex', rand(8,12)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
+				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you are not wearing any panties and giving everyone in the class a clear view of your pussy, as well as the butt plug currently stuffed in your asshole. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
+				*nl
+				'Dimka: "Damn <<$pcs_nickname>>, you getting that ass loose for later?"'
+				'Igor: "Yeah, you have some nice holes there <<$pcs_nickname>>."'
 				if npc_grupTipe['A189'] = 4 and NikoVolkovQW >= 5 and NikoPayback = 0:
 					'"That''s my girl right there," Niko says with a smirk.'
 				elseif npc_grupTipe['A189'] = 4 and NikoPayback > 0:
@@ -401,15 +431,15 @@ if $ARGS[0] = 'math':
 				elseif npc_grupTipe['A189'] = 4:
 					'"Looking good, <<$pcs_nickname>>," Niko grins.'
 				end
-				'You look around the classroom, confused as to what they''re talking about when you hear Julia whisper while pointing at your ass. "Psst, <<$pcs_nickname>>... Your skirt!"'
-				'You suddenly feel your face grow red when you realize what she meant. You quickly solve the problem on the board and return to your seat with your head held down as Mr. Tsarev tries to calm the class, unaware of what has them all riled up.'
-			elseif $pantyworntype = 'none' and analplugin = 1:
+				'You look around the classroom, confused as to what they are talking about when you hear Julia whisper to you while pointing at your ass. "Psst <<$pcs_firstname>>, your skirt." You suddenly feel your face grow red when you realize what she meant. You quickly solve the problem on the board then return to your seat with your head held down while Mr. Tsarev tries to calm the class, unaware of what has them all riled up.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'Mr. Tsarev calls you up to the blackboard to answer a question. As you solve the problem, you drop the chalk on the floor and quickly bend over to pick it up, having forgot that you''re not wearing any panties and giving everyone a clear view of your pussy, as well as the butt plug currently stuffed in your asshole. The boys start whistling and hollering while many of the girls whisper at each other.'
-				'"Damn <<$pcs_nickname>>, you getting that ass loose for later?" Dimka laughs.'
-				'"Yeah, you have some nice holes there, <<$pcs_nickname>>," Igor adds.'
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you aren''t wearing any panties and giving everyone in the class a clear view of both of your holes. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
+				*nl
+				'Dimka: "Damn <<$pcs_nickname>>, you certainly know how how to put on a show."'
+				'Igor: "Yeah, you have some nice holes there <<$pcs_nickname>>."'
 				if npc_grupTipe['A189'] = 4 and NikoVolkovQW >= 5 and NikoPayback = 0:
 					'"That''s my girl right there," Niko says with a smirk.'
 				elseif npc_grupTipe['A189'] = 4 and NikoPayback > 0:
@@ -587,22 +617,14 @@ if $ARGS[0] = 'math':
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/chrissoniabully.jpg"></center>'
-<<<<<<< Updated upstream
 			'Sonia and Christina are called to the front to both work on the same problem to see who can get it done faster. Christina stops in the middle of it, grabs the back of Sonia''s skirt and pulls it up, showing off her ass cheeks as she is wearing a thong. This gets a lot of hoots and hollers from the rest of the class. Mr. Tsarev tries several times to get the class back in order and sends both girls to sit back down.'
-=======
-			'Sonia and Christina are called to the front to work on the same problem to see who can get it done faster. Christina stops in the middle of it, grabs the back of Sonia''s skirt and pulls it up, showing off her ass cheeks since she''s wearing a thong. This gets a lot of hoots and hollars from the rest of the class as Mr. Tsarev tries several times to get things back under control and sends both girls to sit back down.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/larskirtup.jpg"></center>'
-<<<<<<< Updated upstream
 			'During class, Lariska leans forward in her seat to talk to Christina, who is sitting in front of her. As she does Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty-clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
-=======
-			'During class, Lariska leans forward in her seat to talk to Christina, who is sitting in front of her. As she does, Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -624,27 +646,20 @@ if $ARGS[0] = 'math':
 				act 'Read the note':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare3.jpg"></center>'
-					'You unfold the note. "I dare you to take a picture of your pussy and send it to Mr. Tsarev," you read to yourself.'
-					'After reading the note, a bit surprised at what she wrote, you glance up and see both Christina and Lariska encouraging you to do it.'
-					gs 'willpower', 'exhib', 'resist', 'medium'
-					if will_cost <= pcs_willpwr:
-						act 'Refuse (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'
-							christinaQW['bully'] -= 1
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare5.jpg"></center>'
-							'You shake your head and Christina and Lariska taunt you. "Come on, you pussy. Don''t be a little bitch and just do it," Lariska smirks.'
-							'You keep up your resolve and shake your head again.  "Why don''t you do it?" you hiss back at Lariska.'
-							'Christina nods. "Show her you''re no pussy, Lariska."'
-							*nl
-							'She looks around before she puts her phone under her skirt and pulls it back up. You lean over and see a close up of her pussy, which she sends through the school wifi to Mr. Tsarev, who stops what he''s doing and looks at his phone.'
-							'There''s a shocked look on his face for a moment before he looks around, trying to figure out who sent it. A few minutes later, the bell to end class rings.'
-							act 'Leave class': gt 'gschool_lessons', 'short_break'
-						end
-					else
-						act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					'You unfold the note and read it. It says ''I dare you to take a picture of your pussy and send it to Mr. Tsarev.'' After reading the note, a bit surprised at what she wrote, you glance up and you see both Christina and Lariska encouraging you to do it. Lariska, who is sitting next to you, even leans over and whispers "Do it."'
+
+					act 'Refuse':
+						*clr & cla
+						gs 'stat'
+						christinaQW['bully'] -= 1
+						stat_memory['lariska_pussy_shot'] = 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare5.jpg"></center>'
+						'You shake your head and Christina and Lariska taunt you for not doing it. "Come on you pussy. Don''t be a little bitch and just do it."'
+						'You keep up your resolve, shaking your head again and then hiss to Lariska. "Why don''t you do it?"'
+						'Christina nods and says to Lariska "Show her you''re no pussy." Lariska looks around and then puts her phone under her skirt for a moment, then pulls it back up. You lean over to glance and can see a close up image of her pussy. She then sends it through the school wifi to Mr. Tsarev, who stops what he is doing when his phone buzzes and looks at it. There is a shocked look on his face for a moment before he looks around at the class, obviously trying to figure out who sent it. A few minutes later, the bell to end class rings.'
+						act 'Leave class': gt 'gschool_lessons', 'short_break'
 					end
+
 					act 'Do it':
 						*clr & cla
 						christinaQW['bully'] += 1
@@ -652,17 +667,10 @@ if $ARGS[0] = 'math':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare4.jpg"></center>'
 						if $pantyworntype ! 'none':
 							gs 'flash', 'panties', 'indoors', 1, 1
-<<<<<<< Updated upstream
 							'You bite your lip, look around and figure why not? A thrill of excitement runs down your spine at what you are about to do. You make sure no one else is watching, then spread your legs, pull up your skirt and pull your panties aside until your pussy is exposed and take a photo. You quickly pull your panties back in place and pull your skirt back down once you have the picture.'
 						else
 							gs 'flash', 'pussy', 'indoors', 1, 1
 							'You bite your lip, look around and figure why not? A thrill of excitement runs down your spine at what you are about to do. You make sure no one else is watching, then spread your legs and pull up your skirt, exposing your pussy since you are not wearing panties and take a photo of your pussy. You quickly pull your skirt back down once you have the picture.'
-=======
-							'You bite your lip and look around as a thrill of excitment runs down your spine at what you''re about to do. You make sure no one else is watching, then spread your legs, pull up your skirt and pull your panties aside until your pussy is exposed and take a photo. You quickly pull your panties back in place and pull your skirt back down once you have the picture.'
-						else
-							gs 'flash', 'pussy', 'indoors', 1, 1
-							'You bite your lip and look around as a thrill of excitment runs down your spine at what you''re about to do. You make sure no one else is watching, then spread your legs and pull up your skirt to take a photo of your bare pussy. You quickly pull your skirt back down once you have the picture.'
->>>>>>> Stashed changes
 						end
 						gs 'arousal', 'flash', -5, 'exhibitionism'
 						gs 'arousal', 'end'
@@ -761,22 +769,35 @@ if $ARGS[0] = 'history':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
-			gs 'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 2
+			gs'stat'
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy.'
-				'Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 3
+				gs 'fame', 'pav', 'sex', rand(8,12)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
 				'"Well?" Mrs. Sokoloff prods impatiently.'
-				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
-				'From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'arousal', 'flash', -5, 'exhibitionism'
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forgoe that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1221,21 +1242,34 @@ if $ARGS[0] = 'shop':
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
 			gs'stat'
-			if $pantyworntype = 'none' and analplugin = 0:
-				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 3
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Kuznetsov poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy.'
-				'Everyone but Mr. Kuznetsov that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
-				gs 'fame', 'pav', 'sex', 3
+				gs 'fame', 'pav', 'sex', rand(8,12)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed with a butt plug.'
 				*nl
 				'"Well?" Mr. Kuznetsov prods impatiently.'
-				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
-				'From where Mr. Kuznetsov sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Kuznetsov sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+			elseif $pantyworntype = 'none' and analplugin = 0:
+				gs 'arousal', 'flash', -5, 'exhibitionism'
+				gs 'fame', 'pav', 'sex', rand(1,4)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mr. Kuznetsov that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1544,13 +1578,7 @@ if $ARGS[0] = 'shop':
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				if fame['pav_slut'] >= 150:
-<<<<<<< Updated upstream
 					'As you walk into class, you look around and to your despair find that the only seat left is next to Petia, everyone else having given the fat, smelly loser a wide berth. Your nostrils are assaulted as soon as you sit down, the ordeal made worse by Petia leaning in and asking if he can get a blowjob since you''re such a slut. You reply by sticking your fingers in your mouth and gagging. "When will you realize that you''re such a fat and smelly loser that not even <<$pcs_nickname>> will suck your tiny dick?" Arkadi chimes in, causing the gopniks to gang up on him and free you from his horrible attempts at hitting on you.'
-=======
-					'As you walk into class, you look around and to your despair find that the only seat left is next to Petia, everyone else having given the fat, smelly loser a wide berth. Your nostrils are assaulted as soon as you sit down, the ordeal made worse by Petia leaning in and asking if he can get a blowjob since you''re such a slut.'
-					'You reply by sticking your fingers in your mouth and gagging.'
-					'"When will you realise that you''re such a fat and smelly loser that not even <<$pcs_nickname>> will suck your tiny dick?" Arkadi chimes in, causing the gopniks to gang up on him and free you from his horrible attempts at hitting on you.'
->>>>>>> Stashed changes
 				else
 					'As you walk into class, you look around and to your despair find that the only seat left is next to Petia, everyone else having given the fat, smelly loser a wide berth. Your nostrils are assaulted as soon as you sit down, the ordeal made worse by Petia leaning in and continually making disgusting attempts to hit on you, despite you clearly not being interested. You recoil and gag as his proximity makes the smell of him worse.'
 					'"Girls always gag and run away when you talk to them because you''re a fat, disgusting loser that I can smell from over here! They don''t want to and never will suck your tiny dick, so fuck off and leave them alone!" Arkadi chimes in, causing the gopniks to gang up on him and free you from the ordeal.'
@@ -1613,15 +1641,9 @@ if $ARGS[0] = 'shop':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shop/paulnushhump.jpg"></center>'
-<<<<<<< Updated upstream
 			'Near the end of class, Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he is gone no one listens and everyone starts wandering around messing with the tools. Meanwhile, Anushka starts to tease Fedor, asking him if he wants to fuck her until she makes him blush. When he finally admits he is attracted to her, Pauline swoops in behind Anushka, pushes into her and pulls up the back of her skirt.'
 			*nl
 			'She starts pounding her hips against Anushka''s ass. "Oh Anushka you''re so hot, I have always wanted to fuck you." Pauline says, obviously trying to sound like Fedor, and Anushka plays along. "Oh Fedor, you have such an almost average-sized dick! It almost feels good!" This gets the rest of class laughing and Fedor blushing even more. His humiliation ends when the bell rings.'
-=======
-			'Near the end of class, Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he''s gone, everyone starts wandering around and messing with the tools. Meanwhile, Anushka starts to tease Fedor, asking him if he wants to fuck her until she makes him blush. When he finally admits he''s attracted to her, Pauline swoops in behind Anushka, pushes into her and pulls up the back of her skirt.'
-			'She starts pounding her hips against Anushka''s ass. "Oh Anushka, you''re so hot! I''ve always wanted to fuck you!" Pauline says, trying to sound like Fedor, and Anushka plays along. "Oh Fedor, you have such an almost average sized dick! It almost feels good!"'
-			'This gets the rest of class laughing and Fedor blushing even more. His humiliation ends when the bell rings.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'

+ 57 - 23
locations/gschool_lessonsev3.qsrc

@@ -73,16 +73,31 @@ if $ARGS[0] = 'literature':
 		elseif scooltiperand = 4:
 			*clr & cla
 			pcs_mood -= 10
-			if $pantyworntype ! 'none':
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Ms. Braakman poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+				end
+			elseif $pantyworntype = 'none':
 				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 1
+				gs 'fame', 'pav', 'sex', rand(1,4)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow, you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				gs 'arousal', 'flash', -5
-				gs 'fame', 'pav', 'sex', 2
+				gs 'fame', 'pav', 'sex', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question Ms. Braakman poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and pussy.'
@@ -215,13 +230,9 @@ if $ARGS[0] = 'literature':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nushliftskirt.jpg"></center>'
-<<<<<<< Updated upstream
-			'As the bell rings and class ends, everyone gets up and starts to leave class when Radomir says "God damn I need a pick me up." Anushka, who is a little ways in front of him, apparently heard him and lifts her skirt up, showing off her panty-clad ass. Radomir laughs. "I can always count on you to make school fun Nush." Seveal other students check out Anushka''s ass as well as everyone leaves.'
-=======
 			'As the bell rings and class ends, everyone gets up and starts to leave.'
 			'"God damn, I need a pick me up," Radomir says and Anushka, apparently having heard him, lifts her skirt up, showing off her panty clad ass as Radomir laughs. "I can always count on you to make school fun, Nush."'
 			'Several other students check out Anushka''s ass as well as everyone leaves.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -269,7 +280,7 @@ if $ARGS[0] = 'reading':
 		gs 'willpower', 'bj', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Tell him he''s right (<<will_cost>> Willpower)':
-				cla
+				cla & *nl
 				gs 'fame', 'pav', 'sex', 2
 				gs 'willpower', 'bj', 'self', 'easy'
 				gs 'willpower', 'pay', 'self'
@@ -287,7 +298,7 @@ if $ARGS[0] = 'reading':
 		gs 'willpower', 'misc', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Tell him to fuck off (<<will_cost>> Willpower)':
-				cla
+				cla & *nl
 				gs 'willpower', 'misc', 'self', 'hard'
 				gs 'willpower', 'pay', 'self'
 				npc_rel['A159'] -= 2
@@ -313,7 +324,7 @@ if $ARGS[0] = 'reading':
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Join in':
-					cla
+					cla & *nl
 					grupvalue[1] += 1
 					grupvalue[2] += 1
 					grupvalue[3] -= 1
@@ -328,7 +339,7 @@ if $ARGS[0] = 'reading':
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Insult him (<<will_cost>> Willpower)':
-				cla
+				cla & *nl
 				gs 'willpower', 'misc', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
@@ -651,13 +662,9 @@ if $ARGS[0] = 'english':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lerapussy.jpg"></center>'
 			'You notice Lera squirming around in her seat during class and decide to see what''s wrong. "What''s up?" you ask.'
-<<<<<<< Updated upstream
-			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you, but the bell rings to end class. As everyone gets up and heads out of class she says "Nothing you couldn''t fix for me, if you put that tongue to good use for a change." She pulls up her skirt and pulls her panties aside to show you her clean-shaven pussy. Before you can respond, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.'
-=======
 			'She glances at you and it seems like she''s about to give you a sharp retort, but she closes her mouth and seems to really look at you before the bell suddenly rings.'
 			'As everyone gets up and heads out of class, she turns to you. "Something you can fix for me, if you put that tongue to good use for a change."'
 			'She pulls up her skirt and pulls her panties aside to show you her clean shaven pussy. Before you can respond, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -884,8 +891,23 @@ if $ARGS[0] = 'music':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			pcs_mood -= 10
-			gs 'stat'
-			if $pantyworntype ! 'none':
+			gs'stat'
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				end
+			elseif $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex',  1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
@@ -1340,8 +1362,24 @@ if $ARGS[0] = 'art':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
 			pcs_mood -= 10
-			gs 'stat'
-			if $pantyworntype ! 'none':
+			gs'stat'
+			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
+				pcs_memory['school_no_panty_cum_flash'] = daystart
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				*nl
+				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				elseif cum_loc['vagina'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,12)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				elseif cum_loc['anus'] > 0:
+					gs 'fame', 'pav', 'sex', rand(8,15)
+					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+				end
+				
+			elseif $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex',  1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
@@ -1627,11 +1665,7 @@ if $ARGS[0] = 'art':
 		elseif scooltiperand = 13:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/natpanties.jpg"></center>'
-<<<<<<< Updated upstream
 			'Natasha asks Anushka if she can borrow a pencil as she seems to have lost hers. Anushka agrees and offers her one, but keeps pulling it slightly out of reach of Natasha, who keeps stretching forward to reach it. By the time Natasha grabs the pencil from Anushka, she has given everyone behind her a nice look at her panty-clad ass.'
-=======
-			'Natasha asks Anushka if she can borrow a pencil as she seems to have lost hers. Anushka agrees and offers her one, but keeps pulling it slightly out of Natasha''s reach, who keeps stretching forward to reach it. By the time Natasha grabs the pencil from Anushka, she has given everyone behind her a nice look at her panty clad ass.'
->>>>>>> Stashed changes
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'

+ 13 - 6
locations/home_activity.qsrc

@@ -180,16 +180,16 @@ if $ARGS[0] = 'preg_scare':
 	if stat['think_virgin'] = 0:
 		'<i>Ugh, I feel awful!</i> you think to yourself. <i>I wonder if-</i>'
 		*nl
-		'You stop in shock as your brain suddenly puts the facts together:'
+		'The blood drains from your face with a sudden realization:'
 		if daystart - stat['last_man_sex_day'] < 30:
-			if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
-				'You''ve been having sex, your period is late, and you''re throwing up in the morning.'
-			elseif (daystart - daylastperiod > 35) and (daystart - daylastperiod <= 42):
+			if (daystart - daylastperiod > 35) and (daystart - daylastperiod <= 42):
 				'You''ve been having sex, your period is a week late, and you''re throwing up in the morning.'
 			elseif (daystart - daylastperiod > 42) and (daystart - daylastperiod <= 56):
 				'You''ve been having sex, your period is two weeks late, and you''re throwing up in the morning.'
 			elseif daystart - daylastperiod > 56:
 				'You''ve been having sex, your period is a month late, and you''re throwing up in the morning.'
+			else (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
+				'You''ve been having sex, your period is late, and you''re throwing up in the morning.'
 			end
 			*nl
 			'Are you...<i>pregnant?</i>'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'preg_scare':
 				'Your period is a month late and you''re throwing up in the morning.'
 			end
 			*nl
-			'Are you...<i>pregnant?</i> But how? You haven''t fucked a guy in weeks!'
+			'Are you...<i>pregnant?</i> But how? You haven''t had sex with a man in weeks!'
 		end
 	else
 		if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
@@ -297,7 +297,14 @@ if $ARGS[0] = 'preg_scare_react':
 		act'This is impossible':
 			cla & *clr
 			$home_activity['vomit_bathroom']
-			'<i>This doesn''t make any sense,</i> you think to yourself, putting your hand on your head, feeling woozy again.'
+			'<i>This doesn''t make any sense,</i> you think, putting your hand on your head as you feel woozy again.'
+			act'Continue': gt 'bed_get_out', 'start'
+		end
+	elseif stat['vaginal'] = 1:
+		act'You''ve only had sex once!':
+			cla & *clr
+			$home_activity['vomit_bathroom']
+			'<i>But I''ve only had sex once!</i> you cry internally. <i>How can I already be pregnant?!</i>'
 			act'Continue': gt 'bed_get_out', 'start'
 		end
 	end

+ 5 - 1
locations/medical_din.qsrc

@@ -285,7 +285,11 @@ if $ARGS[0] = 'morning_after_pill':
 				'<i>I suppose this is why Aunt Luda gave me this,</i> you think as you take out the morning after pill.'
 			end
 			if $locclass = 'kitr':
-				'You fill up a small glass of water and pop the pill out of the packaging. Putting it in your mouth, you gulp and wash it down with sips of water from the glass.'
+				'You fill up a small glass of water and pop the pill out of the packaging. Putting it in your mouth, you gulp and wash it down with sips of water from the glass, feeling the lump of medication slide down your throat.'
+			elseif $locclass = 'bathroom':
+				'Removing the pill from the packaging, you pop it in your mouth and gulp it down with a handful of water from the sink, feeling the lump of medication slide down your throat.'
+			elseif mc_inventory['refill_bottle'] > 1:
+				'Removing the pill from the packaging, you pop it in your mouth and gulp it down with a sip from your water bottle, feeling the lump of medication slide down your throat.'
 			else
 				'Removing the pill from the packaging, you pop it in your mouth and gulp it down dry, wincing in discomfort as you feel it stick slightly on the way down.'
 			end

+ 14 - 6
locations/npcpreservec.qsrc

@@ -110,8 +110,8 @@ if mid($npctemp,1,1) = 'C':
 	$npc_fidelity[$npclastsaved]	= $npc_fidelity[$npctemp]
 	npc_wife[$npclastsaved]			= npc_wife[$npctemp]
 	npc_girlfriend[$npclastsaved]	= npc_girlfriend[$npctemp]
-	npc_lover_days[$npclastsaved]	= 0
-	npc_lover_keys[$npclastsaved]	= 0
+	npc_lover_days[$npclastsaved]	= npc_lover_days[$npctemp]
+	npc_lover_keys[$npclastsaved]	= npc_lover_keys[$npctemp]
 
 !!	traits
 	
@@ -157,10 +157,18 @@ if mid($npctemp,1,1) = 'C':
 	npc_dislikes_facials[$npclastsaved]	= npc_dislikes_facials[$npctemp]
 	npc_tit_pref[$npclastsaved]		= npc_tit_pref[$npctemp]
 	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
-	npc_sex_spanker[$npclastsaved] 		= npc_sex_spanker[$npctemp]
-	npc_pussyeater[$npclastsaved]		= npc_pussyeater[$npctemp]
-	npc_cum_cannon[$npclastsaved]		= npc_cum_cannon[$npctemp]
-	npc_sex_filmer[$npclastsaved]		= npc_sex_filmer[$npctemp]
+	npc_sex_spanker[$npclastsaved] 	= npc_sex_spanker[$npctemp]
+	npc_pussyeater[$npclastsaved]	= npc_pussyeater[$npctemp]
+	npc_cum_cannon[$npclastsaved]	= npc_cum_cannon[$npctemp]
+	npc_sex_filmer[$npclastsaved]	= npc_sex_filmer[$npctemp]
+	npc_know_bc[$npclastsaved]		= npc_know_bc[$npctemp]
+	npc_know_not_bc[$npclastsaved]	= npc_know_not_bc[$npctemp]
+	npc_thinkage[$npclastsaved]		= npc_thinkage[$npctemp]
+	$npc_know_pubes[$npclastsaved]	= $npc_know_pubes[$npctemp]
+	npc_hj_count[$npclastsaved]		= npc_hj_count[$npctemp]
+	npc_bj_count[$npclastsaved]		= npc_bj_count[$npctemp]
+	npc_fuck_times[$npclastsaved]	= npc_fuck_times[$npctemp]
+	virgin_taker_ID[$npclastsaved]	= virgin_taker_ID[$npctemp]
 	
 	!! This checks if you have had sex with this person before or not
 	npc_sex[$npclastsaved] = npc_sex[$npctemp]