Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/clothing.qsrc

@@ -435,7 +435,7 @@ if $ARGS[0] = 'view_clothing_item':
 	end
 
 	if CloStyle2 = 4:
-		if CloExhibit <= 10:
+		if CloInhibit <= 10:
 			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 		elseif CloSkirt < 5 and CloThinness < 5 and CloBra = 0:
 			if CloQuality = 4:

locations/fight.qsrc

@@ -90,7 +90,11 @@ if $ARGS[0] = 'initFight':
 
 	!! Initialize $pcs_name for Sveta
 	$pcs_name[0] = 'You'
-	$pcs_image[0] = FUNC('$face_image')
+	if ARGS[1] = 1:
+		$pcs_image[0] = 'images/pre/tg/self.jpg'
+	else
+		$pcs_image[0] = FUNC('$face_image')
+	end
 end
 
 if $ARGS[0] = 'clearPCSArray':

locations/preTG.qsrc

@@ -283,9 +283,10 @@ if $ARGS[0] = 'otelPRE':
 											'<center><img <<$set_imgh>> src="images/characters/city/jugo/jugopre.jpg"></center>'
 											'The man has a large tattoo across the left side of his face. He too has red hair'
 											$boy = 'Gustav'
-											gs 'fight','initFight'
+											gs 'fight','initFight',1
 
 											gs 'fight_npcdata', 'gustav'
+											fightEnding = 1
 
 											act 'Fight': gt 'fight', 'start'
 										end

locations/sister_chat.qsrc

@@ -756,7 +756,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Keep talking': gt 'sister_chat', 'sister_chat'
 				end
 			
-				if sisterLesb => 3 and $loc = 'bedrPar':
+				if sisterLesb => 6 and $loc = 'bedrPar':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'