Merge remote-tracking branch 'Sicaa/master'

locations/Voltrener.qsrc

@@ -148,7 +148,6 @@ if $ARGS[0] = 'talk':
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
 					elseif pcs_vball >= 65:
 						'You ask the coach about joining the team, the coach thinks for a minute. "You have good skills for an amateur but you''re still not good enough to start on the team. However, I have a spot for a substitute and we can put you there. How does that sound?"'
-						act 'Leave':gt 'gdksport', 'start'
 						
 						act 'Accept the substitute position':
 							*clr & cla
@@ -161,7 +160,6 @@ if $ARGS[0] = 'talk':
 					end
 				elseif pav_slut > 75:
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
-					act 'Leave':gt 'gdksport', 'start'
 					act 'It''s all lies':
 						*clr & cla
 						gs 'willpower', 'misc', 'self', 'hard'
@@ -193,7 +191,6 @@ if $ARGS[0] = 'talk':
 					end
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
-					act 'Leave': gt 'gdksport', 'start'					
 					gs 'willpower', 'misc', 'self'
 					if will_cost <= pcs_willpwer:
 						act 'Persuade him (<<will_cost>> Willpower)':
@@ -212,6 +209,7 @@ if $ARGS[0] = 'talk':
 						act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red"> You try to prove the coach that he should let you on the team, but you are don''t have enough willpower and the coach countered all your arguments, denying you a place on the team.'
 					end
 				end
+				act 'Leave':gt 'gdksport', 'start'
 			end
 
 			act 'Leave':gt 'gdksport', 'start'

locations/gschool_lessons2.qsrc

@@ -1581,6 +1581,20 @@ if $ARGS[0] = 'post_dress':
 	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
 	act 'Use the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if deodorant > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+		act 'Apply deodorant (0:01)':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			deodorant -= 1
+			gs 'sweat', 'deo'
+			! Using second trimester as switch point. Change if you want
+			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
+			act 'Continue': menu_off = 0 & gt $loc, $metka
+		end
+	end
 	gs 'din_van', 'pblc_pee'
 end
 

locations/metro_events.qsrc

@@ -1049,11 +1049,10 @@ if $ARGS[0] = 'twobbcfinish':
 	'You get down on your knees between them and alternate between sucking one dick and jerking the other one back and forth until they both start to moan. At that point you start jerking them both off, with their dicks pointed at your face. Moments later the first hot stream of cum splatters on your face and some down on your tits, almost at the same time you get hit by another splatter of cum on the other side of your face. They both let out several spurts of cum covering your face and tits with their sperm.'
 	'With them both finished they laugh and quickly get dressed, just as they start to leave the one that speaks better Russian stops and says. "Thank you, you are very good fuck." Then they both walk out leaving you naked and covered in their cum. You get up and start getting dressed yourself.'
 	gs 'arousal', 'bj', 5, 'exhibitionism', 'group', 'sub'
-	gs 'arousal', 'hj', 5, 'exhibitionism', 'group', 'sub'
+	gs 'arousal', 'hj', -5, 'exhibitionism', 'group', 'sub'
 	gs 'cum_call', 'face', 'unknown African man'
 	gs 'cum_call', 'breasts', 'unknown African man'
 	gs 'arousal', 'end'
-	minut -5
 	gs 'stat'
 	act 'Leave': gt 'metro', 'start'
 end