Merge remote-tracking branch 'Sicaa/master'

locations/artemdate.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'gang_rape':
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
 			gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
-			pcs_arousal = 0
+			pcs_horny = 0
 			gs 'stat'
 			act 'Next':
 				*clr & cla
@@ -533,7 +533,7 @@ if $ARGS[0] = 'gang_rape':
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
 				gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
-				pcs_arousal = 0
+				pcs_horny = 0
 				gs 'stat'
 				act 'Too loose':
 					*clr & cla
@@ -542,7 +542,7 @@ if $ARGS[0] = 'gang_rape':
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
 					gs 'arousal', 'anal', 5, 'gangbang', 'rape', 'rough', 'bound'
-					pcs_arousal = 0
+					pcs_horny = 0
 					gs 'stat'
 					act 'Two at a time':
 						*clr & cla
@@ -555,7 +555,7 @@ if $ARGS[0] = 'gang_rape':
 						gs 'boystat', $boy3
 						gs 'arousal', 'bj', -5, 'gangbang', 'rape', 'rough', 'bound'
 						gs 'cum_call', 'anus', 'Gopnik rapist 1', 0, 0, 10000, 40
-						pcs_arousal = 0
+						pcs_horny = 0
 						gs 'stat'
 						act 'Airtight':
 							*clr & cla
@@ -570,7 +570,7 @@ if $ARGS[0] = 'gang_rape':
 							gs 'boystat', $boy6
 							gs 'arousal', 'bj', -10, 'gangbang', 'rape', 'rough', 'bound'
 							gs 'cum_call', '', 'Gopnik rapist 2', 0, 0, 10000, 40
-							pcs_arousal = 0
+							pcs_horny = 0
 							gs 'stat'
 							act 'Overflowing with cum':
 								*clr & cla
@@ -587,7 +587,7 @@ if $ARGS[0] = 'gang_rape':
 								gs 'cum_call', '', 'Gopnik rapist 3', 0, 0, 10000, 40
 								gs 'cum_call', 'anus', 'Gopnik rapist 4', 0, 0, 10000, 40
 								gs 'cum_call', 'mouth', 'Gopnik rapist 5', 0, 0, 10000, 40
-								pcs_arousal = 0
+								pcs_horny = 0
 								gs 'stat'
 								act 'Last one':
 									*clr & cla
@@ -599,7 +599,7 @@ if $ARGS[0] = 'gang_rape':
 									gs 'boystat', $boy4
 									gs 'arousal', 'bj', 5, 'gangbang', 'rape', 'rough', 'bound'
 									gs 'cum_call', 'mouth', 'Gopnik rapist 6', 0, 0, 10000, 40
-									pcs_arousal = 0
+									pcs_horny = 0
 									gs 'stat'
 									act 'Aftermath':
 										*clr & cla

locations/dimalina.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'watch':
 					if pcs_mood > 5: pcs_mood -= 5
 					gs 'dimalina', 'bindpain'
 					gs 'pain', 3, 'throat', 'choke'
-					pcs_arousal += 20
+					pcs_horny += 20
 					minut += rand(30,60)
 					gs 'stat'
 					!!need to reset dimbadgirl to 0 after this so it starts over for each args scene set.
@@ -307,7 +307,7 @@ if $ARGS[0] = 'dimkalina2':
 					'Lina and You are kneeling on the floor. Your underwear is nowhere to be found. She smiles as your last bout of sex has confirmed that being your lover is the best decision in her life. With skilled fingers you tease her inner thighs, making her moan in frustrated anticipation. She begs, pleads and supplicates for more... and finally you caress her lower lips. She cums and the smell of her arousal fills the room. You begin a fast masturbation, giving her what she needs. She cums again and again under your expertise. Finally, you stop and look at her... waiting. Wasted, she asks you to make love to her.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
 					
-					pcs_arousal += 20
+					pcs_horny += 20
 					gs 'stat'
 					
 					gs 'willpower', 'misc', 'self', 'medium'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'dimkalina2':
 					'What the fuck is wrong with him? Why doesn''t he understand that this is all he is good for: licking your boots. You''re tired of him trying to be coy. You could be doing so much more, be instead you have to sit here and train him to be a proper sub bitch. Dimka must sense your growing frustration with him because you hear him whimper and tremble. Not in the mood for his games, you take your other foot and step on his fingers as he kneels beneath you on all fours. You ignore his cries of pain, instead you look out a nearby window and notice a couple walking by. The two are smiling, the woman is giggling and hanging on to him while they whisper to each other. You know as soon as they''re alone, they''ll be fucking each other, and the thought of that makes you both jealous and a bit horny. You wanted to have some fun today, but no, instead you have to deal with this.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
 					
-					pcs_arousal += 20
+					pcs_horny += 20
 					gs 'stat'
 					
 					gs 'willpower', 'misc', 'self', 'medium'
@@ -459,7 +459,7 @@ if $ARGS[0] = 'watch3':
 			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, You are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.' 
 			'Just as you begin to thrust the beads in and out of her ass a bit, you''re pulled back to reality by the sound of grunting from Dimka'
 			*clr & cla
-			pcs_arousal += 10
+			pcs_horny += 10
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Dream of Dimka':
@@ -468,7 +468,7 @@ if $ARGS[0] = 'watch3':
 			'Seeing Dimka drug and rape Lina, your mind drifts and you''re comforted by a dream much better than the reality you''re currently facing.'
 			'You are too good for this bitch. Eventually, you resign to indulging the little shit and have him worship your honey pot. He kneels and licks your sacred pussy and clit, causing you to squirm a bit with pleasure in your seat. Of course you are not going to oblige him, saying that it feels good. He isn''t a lover. But for the moment, he can continue trying to appease you...'
 			'Just as the pleasure begins to build closer to your climax, the needy moans of Lina bring you back to reality.'
-			pcs_arousal += 10
+			pcs_horny += 10
 			gs 'stat'
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end

locations/gschool_lessonsev2.qsrc

@@ -1259,7 +1259,7 @@ if $ARGS[0] = 'shop':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shop/paulnushhump.jpg"></center>'
 			'Near the end of class Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course once he is gone no one listens and everyone starts wandering around messing with the tools in shop. Mean while Anushka starts to tease Fedor asking him if he wants to fuck her, until she makes him blush. When he finally admits he is attracted to her, Paulina swoops in from behind Anushka, pushes into leaning forward and pulls up the back of her skirt.'
 			*nl
-			'Then she starts pounding her hips against Anushka butt. "Oh Anushka your so hot, I have always wanted to fuck you." Paulina says obviously trying to sound like Fedor, Anushka plays along. "Oh Fedor, you have such almost average sized dick, it almost feels good." Which gets the rest of class laughing and Fedor blushing even more, his humiliation ends when the bell rings.'
+			'Then she starts pounding her hips against Anushka butt. "Oh Anushka you''re so hot, I have always wanted to fuck you." Paulina says obviously trying to sound like Fedor, Anushka plays along. "Oh Fedor, you have such almost average sized dick, it almost feels good." Which gets the rest of class laughing and Fedor blushing even more, his humiliation ends when the bell rings.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'

locations/stat_display.qsrc

@@ -1082,6 +1082,8 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab +='<td><a href="exec: $stat_lashes_msg"><img title="<<$stat_lashes_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/lashes.png"></a></td>'
 	end
 
+	if deodorant_on = 1 and pcs_sweat < 20: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/deodorant.png"></a></td>'
+
 	if pcs_sweat > 19: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/need_shower.png"></a></td>'
 	
 	if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or ((pubestyle >= 2 and pubestyle <= 7) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or (pubestyle = 9 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 30):