Merge remote-tracking branch 'Deroc/master'

# Conflicts:
#	locations/zsoft_gopskverGorSlut.qsrc

locations/Voltrenersex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex1.jpg"></center>'
-	'You go to the coaches office just as you open the door an arm reaches out and grabs you by the hand and pulls you inside.'
+	'You go to the coaches office. Just as you open the door, an arm reaches out and grabs you by the hand and pulls you inside.'
 
 	gs 'boyStat', 'A69'
 	silavag = 2
@@ -32,17 +32,17 @@ end
 
 if $ARGS[0] = 'talk':
 	if Voltrenersee = 1:
-		'With a puzzled look on face you look at your coach, he looks at you then let''s go of your hand, and mumbles something: "You have a good technique <<$pcs_lastname>>", with each word his voice becomes more confident "You need to train more. At some point later, I will show you some more techniques, to improve your game." With an even more puzzled look on your face, you turned around and walked out'
+		'With a puzzled look on your face you look at your coach, he looks at you then let''s go of your hand and mumbles something, "You have a good technique <<$pcs_lastname>>." With each word his voice becomes more confident, "You need to train more. At some later point, I will show you some more techniques, to improve your game." With an even more puzzled look on your face, you turn around and walk out'
 	end
 	if Voltrenersee = 2:
-		'Pulling you in and closing the door the coach whispered angrily: "<<$pcs_lastname>> is this what you asking for?", blushing you ran out of the coaches office away from Mikhail Nikolaevich. Although you desire to play on the first team. You''re not ready for something more.'
+		'Pulling you in and closing the door the coach whispered angrily: "<<$pcs_lastname>> is this what you''re asking for?" blushing you run out of the coaches office, away from Mikhail Nikolaevich. Although you desire to play on the first team, you''re not ready for something more.'
 	end
 	if Voltrenersee => 3:
 		cls
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex2.jpg"></center>'
-		'Vigorously shaking his head Mikhail Nikolaevich, closes the door, the coach turned to you and did not say a word, grabbed you and began to lift up your shirt, and paw at your <<$titsize>> breasts.'
+		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you and doesn''t say a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
 		if guy < 3 and pav_slut <= 25: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
 		if (guy >= 3 and guy < 7) or pav_slut > 25: 'You stand and wait until the coach is done playing with your breasts.'
 		if guy >= 7  or pav_slut > 50:

locations/_face_image.qsrc

@@ -1,5 +1,7 @@
 # $face_image
 
+!!use with - <img <<$set_imgh>> src="<<FUNC(''$face_image'')>>">
+
 if player_avatar = 1:$RESULT = 'images/avatar.jpg' & exit
 
 !! These images are missing from my copy of the image folder, so I am commenting them out for now

locations/defence.qsrc

@@ -1,4 +1,9 @@
 # defence
+
+
+
+!! Old code commented out but there for reference
+!!{
 if defence <= 0:
 	defence = 0
 	defenceM = 0
@@ -97,6 +102,6 @@ if defAtkMV > 0:
 
 	if unmaterial > 0:'<b><font color="red">The enemy''s protection shield is trying to absorb your mana but it does not work.</font></b>'
 end
-
+}
 --- defence ---------------------------------
 

locations/panties.qsrc

@@ -1,8 +1,11 @@
 # panties
 
 !!gs 'panties', 'dispose'
+!!to remove panties and destroy them
 !!gs 'panties', 'remove'
+!!To remove panties and store them
 !!gs 'panties', 'wear'
+!!To wear panties
 
 menu_off = 1
 

locations/vipclub.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 							*clr
 							pcs_horny = 0
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/vip4.jpg"></center>'
-							'Then she turns around and puts it in her pussy, you both begin grinding in an attempt to get the most pleasure possible. At the same time, she goes back to giving a blowjbo to the man you hired. You have an explosive orgasm and can''t wait to see what these two will do next for you.'
+							'Then she turns around and puts it in her pussy, you both begin grinding in an attempt to get the most pleasure possible. At the same time, she goes back to giving a blowjob to the man you hired. You have an explosive orgasm and can''t wait to see what these two will do next for you.'
 
 							$orgasm_or = 'yes'
 							gs 'arousal', 'vaginal_dildo', 10, 'dom'