Merge remote-tracking branch 'hornguy6/master'

locations/din_van.qsrc

@@ -291,9 +291,9 @@ $brit = {
 						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
 					end
 				elseif pubestyle = 9:
-					$shave_act = 'Shave your legs and trim your bush'
+					$shave_act = 'Shave your legs and maintain your bush'
 					if pcs_pubes >= 26:
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
 					else
 						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
 					end
@@ -380,7 +380,7 @@ $brit = {
 				else
 					$shave_txt1 = 'You lather up your crotch, carefully shaving away the stubble growing from it. Once you''re finished you glide your hands over your smooth skin, enjoying the feeling.'
 				end
-			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle = 12:
+			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
 				if pcs_pubes >= shave_trigger + 5:
 					$shave_act = 'Shave your pussy'
 					$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'

locations/foto.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'studio':
 					end
 				else
 					'"Yup, I''ve got it right here."'
-					'You hand over your fake passport and he inspects it, comparing it to something on his screen and occasionally clacking on his keyboard. You feel nervous that he might be looking for discrepancies and find out it''s fake before you realize he''s looking back and forth because he''s copying the information into the computer. Probably for employee records or something like that. Then he smirks at you, chuckling to himself as he continues to type. You pale when you realize that he knows the passport is fake. Despite this, he doesn''t make any remarks and finishes his typing.'
+					'You hand over your fake passport and he inspects it, comparing it to something on his screen and occasionally clacking on his keyboard. You feel nervous that he might be looking for discrepancies and find out it''s fake before you realize he''s looking back and forth because he''s copying the information into the computer. Probably for employee records or something like that.'
 					*nl
 					'"Alright, your info''s in the database and you''re now registered as one of our models. Head to the back to undress. When you''re ready, speak to a photographer about work. We work on freelance basis. For our lower level models, we can really only afford to pay you for two shoots a week, but you can still come in any time if you want to get some practice to work on your modelling skills. Those photos will be ours to keep and use, but it will help you to build your portfolio. If your popularity increases, we might have some special work and extra jobs for you so it''s not just twice a week."'
 					'He hands you back your fake passport, smiling.'
@@ -865,7 +865,6 @@ if $ARGS[0] = 'job_offer':
 					'"No, fuck you!" you spit at him. "I''m not going to work for some manipulative ass who gets off on underage girls and leading them on. I''m done here."'
 				end
 				'You angrily pick up your clothes, getting dressed furiously and leave, stomping your way out the door.'
-				'He continues to stand there and softly chuckles to himself. "She''ll be back. They always come back."'
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 				gs 'stat'

locations/foto_shoot.qsrc

@@ -789,7 +789,7 @@ if $ARGS[0] = 'nude':
 	gs 'fame', 'pav', 'modelling', rand(10,15)
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
 	inhib_exp += rand(1,3)
-	if pcs_pubes <= 20:
+	if pcs_pubes < 16:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'
 		'Already naked, you step onto the set and begin the shoot immediately.'
 		*nl