Merge remote-tracking branch 'Hooded_Silence/master'

locations/RimmaSexQW.qsrc

@@ -297,7 +297,7 @@ $rimmasexdi = {
 		'Your climax builds quickly - no surprise after almost half an hour of teasing - when you feel her second hand linger on your throat... and tightening around it. You open your eyes to look at her and while it''s harder to breathe, the passion in Rima''s eyes is infectious.'
 		'The orgasm hits you like a truck, the slight lack of air increasing its intensity by an order of magnitude, and by the looks of it, Rima is just about ready to come herself, getting off immensely on dominating you.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'anal_fist', 20, 'lesbian', 'sub'
+		gs 'arousal', 'vaginal_fist', 20, 'lesbian', 'sub'
 		gs 'stat'
 	elseif RimmaRandEvent = 6:
 		pcs_vag += 5
@@ -309,7 +309,7 @@ $rimmasexdi = {
 		'You barely even register when she sinks her whole hand into your depths - at that point, you are so desperately horny that you are literally begging her to make you cum, and this time, her fist inside you, she finally relents.' 
 		'From one moment to the next, she starts fucking you with her whole hand, pushing you right to the edge and over, then right to the next and over again. You can feel yourself twitching around her hand, gripping her like a vice, but the rest of your body is a shaking, screaming, sweating mess. That doesn''t change the fact, though, that Rima gave you a couple of incredible orgasms, though.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'anal_fist', 20, 'lesbian', 'sub'
+		gs 'arousal', 'vaginal_fist', 20, 'lesbian', 'sub'
 		gs 'stat'
 	elseif RimmaRandEvent = 5:
 		pcs_vag += 2

locations/core_library.qsrc

@@ -98,6 +98,8 @@ end
 !! clothing_status - fnct to determine clothing status
 
 if $ARGS[0] = 'clothing_status':
+    if $pantyworntype = 'none': $apparel['panty'] = 'pantyless'
+    if $braworntype = 'none': $apparel['bra'] = 'braless'
     if $clothingworntype =  'nude': $apparel['status'] = 'nude'
     if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':  $apparel['status'] = 'sport'
     if $clothingworntype = 'ballet_secrets' and $shoeworntype = 'ballet_secrets':  $apparel['status'] = 'dance'
@@ -111,7 +113,6 @@ if $ARGS[0] = 'corridor':
     if $location_type = 'private':
     elseif $location_type = 'public':
     end
-    
 end
 
 if $ARGS[0] = 'bathroom':

locations/foto_shoot.qsrc

@@ -874,7 +874,7 @@ end
 if $ARGS[0] = 'sportswear':
 	*clr & cla
 	minut += 120
-	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (fame['city_sport']/2)
 	modelfoto['fitness'] += 1
 	pcs_sweat = 60
 	gs 'exp_gain', 'mdlng', rand(2,4)
@@ -904,7 +904,7 @@ end
 if $ARGS[0] = 'sports_underwear':
 	*clr & cla
 	minut += 120
-	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (fame['city_sport']/2)
 	modelfoto['fitness'] += 1
 	pcs_sweat = 60
 	gs 'fame', 'city', 'modelling', 'small'
@@ -931,7 +931,7 @@ end
 if $ARGS[0] = 'fitness_artistic_nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + fame['city_modelling'] + pcs_apprnc + city_sport
+	modelpay = (pcs_mdlng/2 * 10) + fame['city_modelling'] + pcs_apprnc + fame['city_sport']
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto['fitness'] += 1
 	modelfoto['nude'] += 1

locations/natalia_pavlova.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'first_chat':
 		'You smile. "I get that. Anyway, hello and welcome to our school. Maybe we''ll chat again at some point?"'
 		'"Yes, I''d like that," she answers. "See you later, <<$pcs_nickname>>."'
 	
-	elseif grupTipe = 5 and fame['slut'] < 175:
+	elseif grupTipe = 5 and fame['pav_slut'] < 175:
 		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up at you.'
 		'You smile. "Hi, I''m <<$pcs_nickname>>."'
 		'Natalia turns to you. "Umm... Hi? What brings you here?"'