Merge remote-tracking branch 'Anya/master'

locations/LariskaSex.qsrc

@@ -304,7 +304,7 @@ if $ARGS[0] = 'bj_1':
 	'Putting her hands on the back of your head, she starts face-fucking you in long, deep strokes. She pulls it out, smacks your cheeks and forehead with it, before pushing it back in.'
 	'Eventually she tires of this game, eager to put her rubber dick to use on your other holes.'
 	pcs_horny += 5
-	gs 'arousal', 'bj', -5, 'lesbian', 'sub'
+	gs 'arousal', 'dildo_suck', -5, 'lesbian', 'sub'
 	gs 'stat'
 	if stat['virgin'] = 1:
 		act 'Get your cherry popped':

locations/anushkaev1.qsrc

@@ -89,7 +89,7 @@ if $ARGS[0] = 'strapon1':
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme6.jpg"></center>'
 										'Several minutes go by before she climbs off your face, grabs the harness and quickly slides it on. After making sure it''s securely in place, she grabs you by the hair and pulls your face over the dildo. "Suck my dick, slut!"'
 										'You obediently open your mouth and take the <<dick>>cm <<$dick_girth>> dildo in your mouth. She mostly lets you control how deep you take it, although she pushes it a bit deeper a few times, making you gag a little.'
-										gs 'arousal', 'bj', 5, 'lesbian'
+										gs 'arousal', 'dildo_suck', 5, 'lesbian'
 										gs 'stat'
 										act 'Get fucked':
 											*clr & cla
@@ -262,7 +262,7 @@ if $ARGS[0] = 'strapon1':
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme6.jpg"></center>'
 									'Several minutes go by before she climbs off your face, grabs the harness and quickly slides it on. After making sure it''s securely in place, she grabs you by the hair and pulls your face over the dildo. "Suck my dick, slut!"'
 									'You obediently open your mouth and take the <<dick>>cm <<$dick_girth>> dildo in your mouth. She mostly lets you control how deep you take it, although she pushes it a bit deeper a few times, making you gag a little.'
-									gs 'arousal', 'bj', 5, 'lesbian'
+									gs 'arousal', 'dildo_suck', 5, 'lesbian'
 									gs 'stat'
 									act 'Get fucked':
 										*clr & cla
@@ -1130,13 +1130,13 @@ if $ARGS[0] = 'couch_strapon_get':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/cstrapget2.jpg"></center>'
 			'She places her hand on the back of your head and pulls your head down to the strapon. "Suck my dick, slut!"'
 			'You open your mouth, take the dildo into your mouth and sucking on it, getting it nice and wet while her hand guides your head, occasionally forcing it a bit further into your mouth. "Fuck, you''re such a good cock sucker <<$pcs_nickname>>. No wonder all the boys talk about you." she tells you in a teasing tone. Her dirty talk turns you on.'
-			gs 'arousal', 'bj', 2, 'lesbian', 'sub'
+			gs 'arousal', 'dildo_suck', 2, 'lesbian', 'sub'
 			gs 'stat'
 			act 'Swallow the whole thing':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/cstrapget3.jpg"></center>'
 				'She starts forcing your head down more and more, gagging you with the dildo and making you slobber all over it. "Come on you fucking slut, I know you can deepthroat this." she says just before she forces the dildo down your throat, gagging you. After a few seconds, she finally releases you to let you catch your breath before doing it again. She pulls off most of her clothes while she face fucks you.'
-				gs 'arousal', 'bj', 3, 'lesbian', 'sub', 'deepthroat'
+				gs 'arousal', 'dildo_suck', 3, 'lesbian', 'sub', 'deepthroat'
 				gs 'stat'
 				act 'Turn around':
 					*clr & cla

locations/gschool_office.qsrc

@@ -615,7 +615,7 @@ if $ARGS[0] = 'whore2':
 				'She rises just a bit and then uses her hand to tilt the dildo down to your mouth. "That wasn''t too bad, <<$pcs_lastname>>. All you have to do now is suck my dick clean, and then you can go. Or maybe you''d rather...?" She leaves the exact alternative unspoken, but you have no doubt as to what she is alluding to, and while you''d rather be doing anything else than sucking a large dildo your headmaster just violated your ass with, it beats getting fucked up your sore ass with it again.'
 				*nl
 				'With the choice rather easy, you obediently open your mouth and start sucking it clean, ignoring both the taste and the throbbing pain in your bowels as best you can.'
-				gs 'arousal', 'foreplay_give', 2, 'lesbian', 'humiliation', 'sub'
+				gs 'arousal', 'dildo_suck', 2, 'lesbian', 'humiliation', 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Get out':

locations/tatiana_lab.qsrc

@@ -928,7 +928,7 @@ if $ARGS[0] = 'teach_full':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_dildo', 30
 			gs 'arousal', 'anal_dildo', 30
-			gs 'arousal', 'bj', 30
+			gs 'arousal', 'dildo_suck', 30
 			gs 'arousal', 'end'
 			minut -= 60
 			gs 'stat'
@@ -1324,7 +1324,7 @@ if $ARGS[0] = 'suctraining':
 !!				Maybe add arousal call here
 				'She suddenly turns away from you, and you realize that you have reached her workbench. She grabs two smallish vials off the top, pops the tops off both, and hands you one, saying, "Drink this," before downing the other.'
 				'It tastes like strawberry syrup.'
-				'This time you''re ready when Tatiana lunges at you, and you resume kissing as you lead her toward the couch while she is striping the clothes off both of you and you feel a large amount of your stored energy being released into your body.'
+				'This time you''re ready when Tatiana lunges at you, and you resume kissing as you lead her toward the couch while she is stripping both your clothes off and you feel a large amount of your stored energy being released into your body.'
 				'Once there, you both sit down facing each other. She looks at you with burning lust and says, "Do it!"'
 				act 'Proceed': gt 'succubus', 'tatianasex'
 				exit