Merge https://git.catrenelle.com/bgkjdgbizgblzdgbr/glife

locations/changingroom.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'view_swim_list':
 
 	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0 and ARRSIZE('nerdvana_swimsuit') = 0 and ARRSIZE('nerdvana_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
-	elseif $loc = 'fit' or $loc = 'bass' or temper >= 15:
+	elseif $loc = 'fit' or $loc = 'bass' or $loc_arg = 'kathansaunasw1' or $loc_arg = 'kathansaunasw2' or temper >= 15:
 		if PCloswimwear = 0 and $clothingworntype ! 'nude':
 			$lastwornclothingtype['swim'] = $clothingworntype
 			lastwornclothingnumber['swim'] = clothingwornnumber

locations/city_apt_building.qsrc

@@ -133,6 +133,8 @@ end
 if $ARGS[0] = 'roof':
 	$menu_loc = 'city_apt_building'
 	$menu_arg = 'roof'
+	$loc_arg = 'roof'
+	$loc = 'city_apt_building'
 	killvar '$locclass'
 	menu_off = 0
 	minut += 1

locations/journal_quests.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'start':
 		'<center><h1>Katja Meynold</h1></center>'
 		*nl
 		if katjaQW['QWstage'] = 0:
-			'Katja is both cute, smart and popular. If I want to be her friend'+iif(npc_rel['A14'] < 60, ', I need to get to know her better by talking with her at school or the disco', '')+ +iif(pcs_makupskl < 40, ', I need to improve my make up skill since she is very into make up', '')+ +iif(class['school_grade_average'] < 64, ', I need to improve my grades since being good at school is important to her', '')+ +iif(fame['pav_slut'] >= 25, ', I need to be seen as less of a slut', '')+ +iif(hotcat >= 6, ', I need to improve my looks', '')+ +iif(npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6, ', I should probably go to school and see if somthing happens.', '.')
+			'Katja is both cute, smart and popular. If I want to be her friend'+iif(npc_rel['A14'] < 60, ', I need to get to know her better by talking with her at school or the disco', '')+ +iif(pcs_makupskl < 40, ', I need to improve my make up skill since she is very into make up', '')+ +iif(class['school_grade_average'] < 65, ', I need to improve my grades since being good at school is important to her', '')+ +iif(fame['pav_slut'] >= 25, ', I need to be seen as less of a slut', '')+ +iif(hotcat < 6, ', I need to improve my looks', '')+ +iif(npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6, ', I should probably go to school and see if somthing happens.', '.')
 		elseif katjaQW['QWstage'] = 1:
 			'Katja has agreed to hang out after school. I should do this more often to see where this leads.'
 		elseif katjaQW['QWstage'] = 2:
@@ -349,7 +349,7 @@ if $ARGS[0] = 'start':
 			end
 
 			if katjaQW['pantiesQWstage'] = 0:
-				'It could be fun to see if I could get Katja to go to school without panties. To do this, I need to speak with her at school when I''m not wearing panties so she can see that I''m not wearing any'+iif(katjaQW['slut'] >= 40 and katja['school_sex'] = 0, ', I should probably accept her advances at school', '')+ +iif(katjaQW['slut'] < 20, ', I need to loosen up Katja in other ways first. For example, by getting her to be naked at the beach.', '.')
+				'It could be fun to see if I could get Katja to go to school without panties. To do this, I need to speak with her at school when I''m not wearing panties so she can see that I''m not wearing any'+iif(katjaQW['slut'] >= 40 and katjaQW['school_sex'] = 0, ', I should probably accept her advances at school', '')+ +iif(katjaQW['slut'] < 20, ', I need to loosen up Katja in other ways first. For example, by getting her to be naked at the beach.', '.')
 			elseif katjaQW['pantiesQWstage'] < 4:
 				'I think I''m getting close to having Katja take off her panties at school. Just have to push her a little more...'
 			elseif katjaQW['pantiesQWstage'] = 4: