Merge remote-tracking branch 'Awesome/master'

locations/gschool_boys_bathroom.qsrc

@@ -633,7 +633,7 @@ if $ARGS[0] = 'boy5':
 			$orgasm_or = 'no'
 			gs 'arousal', 'bj', 3, 'group'
 			gs 'boyStat', 'A3'
-			if $pantyworntype = 'nude':
+			if $pantyworntype = 'none':
 				'After about a minute of licking and blowing Fedor, you switch and start sucking Ivan''s <<dick>>cm <<$dick_girth>> cock while stroking Fedor''s. He doesn''t seem content with just that, so Fedor reaches down and grabs you by the hips to pull you up. You don''t resist, following his silent suggestion, but you don''t take your mouth off Ivan''s cock as you move, your eyes locked with his as you bob up and down his length. Now standing and bent over, Fedor pulls up your skirt and starts rubbing your pussy with his fingers; he may not be the sharpest tool in the shed, but you have to admit, he knows how to hit the right spots. You can''t see what he''s doing to your pussy, but Ivan can feel the vibrations of your muffled moans.'
 			else
 				'After about a minute of licking and blowing Fedor, you switch and start sucking Ivan''s <<dick>>cm <<$dick_girth>> cock while stroking Fedor''s. He doesn''t seem content with just that, so Fedor reaches down and grabs you by the hips to pull you up. You don''t resist, following his silent suggestion, but you don''t take your mouth off Ivan''s cock as you move, your eyes locked with his as you bob up and down his length. Now standing and bent over, Fedor pulls down your panties and starts rubbing your pussy with his fingers; he may not be the sharpest tool in the shed, but you have to admit, he knows how to hit the right spots. You can''t see what he''s doing to your pussy, but Ivan can feel the vibrations of your muffled moans.'

locations/pushkin_ballet_res.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'hallway':
 			act 'Attend Ballet Classes': gt 'pushkin_ballet_class', 'start'
 		elseif hour = 7 and (minut > 30 and minut <= 59):
 			$balletEv['trigger'] = 'late'
-			gs 'npc_init_3501', 'summer_school'
+			gs 'npc_3501_init', 'summer_school'
 		else
 			act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
 		end

locations/rex_party_smallEvents.qsrc

@@ -677,7 +677,7 @@ if $ARGS[0] = 'party_girls_dance':
         inhib_exp += rand(1,2)
         gs 'stat'
         '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_14_<<rand(1,4)>>.jpg"></center>'
-        'You have a lot of fun as you dance with the girls under the deafening music. During the dance you are pressed against each other and the other girls touch you in all sorts of places. Suddenly a pair of hands pull up you skirts and bare your ass. One of the girls pulls down your panties and starts to kiss and lick you.'
+		'You have a lot of fun as you dance with the girls under the deafening music. During the dance you are pressed against each other and the other girls touch you in all sorts of places. Suddenly a pair of hands pull up your skirt and bare your ass. One of the girls '+ iif($pantyworntype ! 'none', 'pulls down your panties and ', '')+'starts to kiss and lick you.'
         if Rex_Love = 1: 'Rex watches you with interest as you have fun with the girls.'
         'The girls are only getting warmed up and offer you more.'
         gs 'willpower', 'cuni', 'resist', 'medium'

locations/sleep_events.qsrc

@@ -290,7 +290,7 @@ if $ARGS[0] = 'wake_horny2':
 		act 'Wake your husband and see if he''s in the mood':
 			strip_here = 0
 			InSleep = 0
-			gs 'sleep_event', 'exit'
+			gs 'sleep_events', 'exit'
 			gt 'husbSex', 'variant'
 			!!Should be custom scene - maybe boyfriend/husband overhaul can cover this?
 		end

locations/sny.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'kiss':
 		gs 'boyStat', 'A1'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/pett2.jpg"></center>'
-		'After he rubs your clit, you start moaning. You feel your pussy getting wet, and he can feel your wetness through your panties after several minutes of this. He gets up and pulls you around to the front of the couch, turning you to face the couch with your back to him. He pulls down your panties and pushes you down on your knees, bending you over till your body is resting on the couch. He slips his <<dick>>cm <<$dick_girth>> cock into your wet pussy and starts fucking you slow and gentle.'
+		'After he rubs your clit, you start moaning. You feel your pussy getting wet, and he can feel your wetness through your panties after several minutes of this. He gets up and pulls you around to the front of the couch, turning you to face the couch with your back to him. He'+ iif($pantyworntype ! 'none', ' pulls down your panties and ', '')+'pushes you down on your knees, bending you over till your body is resting on the couch. He slips his <<dick>>cm <<$dick_girth>> cock into your wet pussy and starts fucking you slow and gentle.'
 		gs 'arousal', 'vaginal', 5
 		gs 'arousal', 'foreplay', 5
 		minut -= 5