Merge remote-tracking branch 'Anjuna/master'

locations/gschool_lessonsev2.qsrc

@@ -300,7 +300,7 @@ if $ARGS[0] = 'geography':
 							grupvalue[4] += 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
 							'You quickly start wiping the cum off you while giving them dirty looks, one of the girls giving you some tissues to help. You quickly clean yourself and your clothes up as best you can before Mrs. Sokoloff notices you. "What are you doing over there, Miss <<$pcs_lastname>>?"'
-							'You glance up at her before turning to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up."' 
+							'You glance up at her before turning to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up."'
 							'Mrs. Sokoloff looks up at the ceiling, as if expecting something to fall from it before she goes back to teaching the class.'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -599,7 +599,7 @@ if $ARGS[0] = 'math':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/fuckoff.jpg"></center>'
 					'What a pervert! You squeeze your legs together and loudly clear your throat. When Mr. Tsarev looks at you, he stares right at your extended middle finger. Everyone in class notices and all eyes are on you now.'
 					'"What is the meaning of this, Miss <<$pcs_lastname>>!?" he angrily scowls.'
-					'You''re not impressed. "One more look, and I''m telling the principal," you boldly say.' 
+					'You''re not impressed. "One more look, and I''m telling the principal," you boldly say.'
 					*nl
 					'He looks slightly nervous now, knowing that you caught him staring at you and tries to compose himself. "Miss <<$pcs_lastname>>, get out of my class!"'
 					'You have no intentions of getting up  "And I don''t know, maybe your wife?" you say with a sly smile.'
@@ -901,7 +901,7 @@ if $ARGS[0] = 'history':
 								'You spend the rest of class with Roman''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity.' 
+								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity.'
 								'The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris, but your bare pussy is too tempting and you abandon the pencil for your two middle fingers. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
 								$orgasm_txt = 'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your legs clenching hard in orgasm. You bite your lip hard as you ride out the waves of pleasure and you feel Roman''s hand slide away before you see Mrs. Sokoloff giving you a curious look. With confident eyes and a bright smile, you quickly fix your clothes and sit up in your seat.'

locations/stat_display.qsrc

@@ -37,7 +37,7 @@ if debug['trace_shown'] ! 0:
 			p 'clear'
 		end
 		nl '<hr>'
-		
+
 		p '<a href="exec:$debug[''direct_trace''] = '''' & gs ''stat_display''">clear</a>&nbsp;|&nbsp;'
 		pl '<a href="exec:debug[''trace_shown''] = 0 & gs ''stat''">return</a></center>'
 
@@ -114,7 +114,7 @@ if Enable_showstatimg = 1:
 		$img_temp = func('$body_image','bodysuit')
 		if $img_temp ! '':  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	
+
 	if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
 	else
@@ -362,7 +362,7 @@ end
 
 if hypnoSchedule = 1:
 	if therapist_weekly_block = 0 and week = 4 and therapistday ! daystart:
-		if $stat_hypno_msg ! '': 
+		if $stat_hypno_msg ! '':
 			$stat_hypno_msg += '<br>'
 			$stat_hypno_tooltip += '<br>'
 		end
@@ -1175,7 +1175,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and cheatVars['no_periods'] = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/vagina.png"></a></td>'
 	end
-	
+
 	if menu_off = 0 and birth_control['remind_icon'] = 1:
 		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			$statusIconBarTab += '<td><a href="exec:msg ''You are out of birth control pills!''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
@@ -1185,7 +1185,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and birth_control['remind_icon'] = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 	end
-	
+
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		$stat_bleed_msg = 'You need to use your feminine hygiene products'+iif($pantyworntype = 'none', ' and you need to also wear panties if you want to use a sanitary pad.', '.')
 		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vperiod_bleeding.png"></a></td>'
@@ -1274,7 +1274,7 @@ if cheatStatusIcons = 0:
 		else
 			if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or  cumloc[11] > 0 or cumloc[13] > 0 or  cumloc[14] > 0 or cumloc[16] > 0:
 				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) : 
+			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) :
 				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
 			else
 				$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
@@ -1382,7 +1382,7 @@ if cheatStatusIcons = 0:
 				$stat_masseuse_msg += '17:00, '
 			end
 			$stat_masseuse_msg += 'and you have worked <<masseuse[''shifts_worked'']>> of the required <<masseuse[''shifts_required'']>> shifts.'
-		
+
 			$statusIconBarTab += '<td><a href="exec: msg $stat_masseuse_msg"><img title="<<$stat_masseuse_msg>>" height = <<set_siconht>> src="images/system/icons/status/masseuse.png"></a></td>'
 		end
 	end
@@ -1417,7 +1417,7 @@ if cheatStatusIcons = 0:
 		$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'
 		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
 	end
-	
+
 	if pfilmNO ! 1:
 		if pornstar['icon'] = 1 and pornstar['icon_disable'] ! daystart:
 			if hour < 11:
@@ -1432,7 +1432,7 @@ if cheatStatusIcons = 0:
 			end
 		end
 	end
-	
+
 	$statusIconBarTab += '</tr><tr>'
 
 	!!Row 5: Clothes,...
@@ -1975,7 +1975,7 @@ if enable_extra_msg = 1:
 
 	if drugVars['cigarettes_day'] = daystart and drugVars['cigarettes_hour'] = hour and drugVars['cigarettes_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
 	if drugVars['weed_day'] = daystart and drugVars['weed_hour'] = hour and drugVars['weed_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
-	
+
 	if cheatVars['no_sweat'] = 0:
 		if pcs_sweat > 59:
 			$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b><br>'

locations/therapist_home.qsrc

@@ -190,6 +190,7 @@ if $ARGS[0] = 'sex':
 				*clr & cla
 				gs 'arousal', 'vaginal', 5, 'sub'
 				gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
+				$orgasm_or = 'yes'
 				gs 'arousal', 'end'
 				gs 'stat'
 

locations/uni_lessons_electives1.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'Computers 101':
 	'You walk into the classroom and take a seat at one of the computer stations. The rest of your classmates walk in one-by-one before Mr. Blagov enters the lab and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Blagov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'computers 101', pcs_intel
@@ -61,7 +61,7 @@ if $ARGS[0] = 'Computers 101':
 				if npc_rel['A1'] >= 60:
 					'You sit next to Dimka, but other than making a few crude remarks about your sexual exploits, he just ignores you and a fellow student asks you to be quiet.'
 				else
-					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."' 
+					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."'
 					'You hear several other students snicker at his comments. Embarrassed, you move to another location and sit by yourself.'
 				end
 			else
@@ -83,10 +83,10 @@ if $ARGS[0] = 'Computers 101':
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
 			if npc_rel['A144'] >= 60:
 				if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
-					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"' 
+					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"'
 					'You know she''s just being her normal playful self and the two of you are talking away and missing much of the class.'
 				else
-					'You sit next to Anushka, who smiles at you as you sit down. "What up?"' 
+					'You sit next to Anushka, who smiles at you as you sit down. "What up?"'
 					'The two of you are soon talking away and missing much of the class.'
 				end
 			elseif npc_rel['A144'] <= 20:
@@ -242,7 +242,7 @@ if $ARGS[0] = 'art_101_model':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
@@ -250,7 +250,7 @@ if $ARGS[0] = 'art_101_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
@@ -262,8 +262,8 @@ if $ARGS[0] = 'art_101_model':
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'art_101_model':
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	end
 end
-
+s
 if $ARGS[0] = 'art_101_model_igor':
 	menu_off = 1
 	gs 'stat'
@@ -286,31 +286,31 @@ if $ARGS[0] = 'art_101_model_igor':
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly and Igor seems engrossed by it.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most. The class goes by fairly quickly.'
 		end
 	else
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."' 
-			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."'
+			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."' 
-			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."'
+			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.'
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
@@ -341,11 +341,11 @@ if $ARGS[0] = 'art_101_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to start drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to start drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Aww, man!" you hear Feofan mutter in disappointment.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Aww, man!" you hear Feofan mutter in disappointment.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Feofan seems to be focusing on trying to draw the guys shoes. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
@@ -353,12 +353,12 @@ if $ARGS[0] = 'art_101_model_feofan':
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
-			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.'
+			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."'
 			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
+			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your position, Miss Barlovskaya."'
 			'Albina stands on the platform and assumes a position where she pulls her leg up to the back of her head. Her muscular legs and toned ass are highlighted by her yoga pants as Mr. Ilyushin nods in approval and walks to the back of the class, where he tells everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Albina, you overhear a few of your male classmates talking about she''s one of the hottest girls they''ve ever drawn and how they hope she models next semester too. The class goes by fairly quickly. Meanwhile, Feofan seems to spend a lot of time trying to draw her ass just right. The class goes by fairly quickly.'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			'You notice that Natasha seems happy drawing the object and gets on with it, rarely needing guidance from the professor, but the class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too.'
 			'You''re sitting next to Natasha and notice that as soon as the model takes his place, she gets very embarrassed and starts blushing. She clearly struggles to concentrate and keeps making mistakes as you see her rubbing out parts of her drawing and starting over until the professor comes over and talks to her. The class goes by fairly quickly.'
 		elseif temprand = 3:
@@ -401,7 +401,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			'You notice that Natasha seems to struggle at first and blushes slightly. After a few pointers from the professor, she gains confidence and seems happy to continue. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
 			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too.'
 			'You look over at Natasha and notice that as soon as Anushka straddles the bar, she gets deeply embarrassed and starts blushing. She clearly struggles during the lesson, requiring the professor to spend some time with her, but the class goes by fairly quickly.'
 		elseif temprand = 5:
@@ -424,7 +424,7 @@ if $ARGS[0] = 'Psychology 101':
 	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
@@ -465,13 +465,13 @@ if $ARGS[0] = 'Psychology 101':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
 				if kendraQW['sub'] < 1:
 					'You''re about to sit next to Kendra when she glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 				elseif kendraQW['sub'] >= 10:
 					if npc_rel['A82'] >= 60:
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You''re about to sit next to Kendra when she glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end
@@ -480,7 +480,7 @@ if $ARGS[0] = 'Psychology 101':
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'  
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end

locations/uni_lessons_electives2.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Computers 102':
 	'You walk into the classroom and take a seat at one of the computer lab stations. The rest of your classmates walk in one by one before Mr. Blagov enters the classroom and closes the door. He turns to the class and starts today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Blagov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'computers 102', pcs_intel
@@ -60,7 +60,7 @@ if $ARGS[0] = 'Computers 102':
 				if npc_rel['A4'] >= 60:
 					'You sit next to Dimka, but other than making a few crude remarks about your sexual exploits, he just ignores you and a fellow student asks you to be quiet.'
 				else
-					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."' 
+					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."'
 					'You hear several other students snicker at his comments. Embarrassed, you move to another location and sit by yourself.'
 				end
 			else
@@ -82,10 +82,10 @@ if $ARGS[0] = 'Computers 102':
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
 			if npc_rel['A144'] >= 60:
 				if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
-					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"' 
+					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"'
 					'You know she''s just being her normal playful self and the two of you are talking away and missing much of the class.'
 				else
-					'You sit next to Anushka, who smiles at you as you sit down. "What up?"' 
+					'You sit next to Anushka, who smiles at you as you sit down. "What up?"'
 					'The two of you are soon talking away and missing much of the class.'
 				end
 			elseif npc_rel['A144'] <= 20:
@@ -238,7 +238,7 @@ if $ARGS[0] = 'art_102_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -246,11 +246,11 @@ if $ARGS[0] = 'art_102_model':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -263,19 +263,19 @@ if $ARGS[0] = 'art_102_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina3.jpg"></center>'
@@ -295,7 +295,7 @@ if $ARGS[0] = 'art_102_model_igor':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -303,12 +303,12 @@ if $ARGS[0] = 'art_102_model_igor':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. Igor, meanwhile, is looking a little flushed as he starts drawing.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor looks her over as she strips down, but he doesn''t seem to be leering like the other boys. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. Igor, meanwhile, seems very intent on trying to capture her feminine form, paying special attention to her clothes and body position. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -321,19 +321,19 @@ if $ARGS[0] = 'art_102_model_igor':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, is looking a little flushed as he starts drawing. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina3.jpg"></center>'
@@ -353,7 +353,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -362,12 +362,12 @@ if $ARGS[0] = 'art_102_model_feofan':
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in and strips down to her panties.'
-			'"I''m so glad I took art this year," you overhear Feofan mutter to himself as she sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'"I''m so glad I took art this year," you overhear Feofan mutter to himself as she sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Glancing over at Feofan''s work, you notice he seems to being spending a lot of time drawing her breasts.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly, but you do notice how Mr. Ilyushin seems to spend more time than normal with Feofan.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -380,21 +380,21 @@ if $ARGS[0] = 'art_102_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'You notice Feofan is trying not to look at the naked guy, which only makes you smile at his discomfort. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Man, I love art class..." Feofan mutters to himself.' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Man, I love art class..." Feofan mutters to himself.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.'
 			'As Anushka strips down, you notice Feofan swallow as he tries not to stare. You''re pretty sure you can see a growing bulge in his pants though.'
-			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom//electives/art/models/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya." Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
@@ -413,7 +413,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. This is a theory lesson which Natasha is clearly comfortable with and she doesn''t require any assistance from the lecturer. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -421,12 +421,12 @@ if $ARGS[0] = 'art_102_model_natasha':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. You look over at Natasha and notice that she''s bright red. You aren''t sure if this is due to embarrassment or if she might fancy the model; maybe it''s a bit of both. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look over at Natasha, you see that she''s clearly uncomfortable with the woman''s lack of clothing and is unable to stop herself from blushing. You let out a small, quiet giggle before concentrating on your work for the rest of the lesson. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. When you glance over at Natasha, you see that she''s clearly a bit uncomfortable with Anushka''s state of undress and despite her best efforts, she can''t stop herself from blushing slightly. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -439,20 +439,20 @@ if $ARGS[0] = 'art_102_model_natasha':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Natasha concentrates hard on the lecture and is clearly comfortable with a theory lesson. The lecturer didn''t need to come over to her and could concentrate on helping some of the other students. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
-			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously.' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
+			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously.'
 			'You notice that Natasha is glowing bright red and think back to school, feeling that the reason she''s so embarrassed at the whole situation is because she was rumoured to have gone out on a few dates with Lazar, so this model clearly wouldn''t appeal to her.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look at Natasha, you see that she''s clearly very uncomfortable with the situation and is simply unable to stop herself from blushing. You quietly giggle, but the lecturer notices and tells you to get on with your work before going to help Natasha. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her.'
 			'You glance over at Natasha and see that she''s clearly uncomfortable with Anushka''s lack of clothing. She blushes occasionally and clearly struggles to concentrate on her work until the lecturer comes over and talks to her, giving her come encouragement and guidance.'
 		elseif temprand = 5:
@@ -474,7 +474,7 @@ if $ARGS[0] = 'Psychology 102':
 	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
@@ -515,13 +515,13 @@ if $ARGS[0] = 'Psychology 102':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
 				if kendraQW['sub'] < 1:
 					'You start to sit next to Kendra, who glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 				elseif kendraQW['sub'] >= 10:
 					if npc_rel['A82'] >= 60:
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end
@@ -530,7 +530,7 @@ if $ARGS[0] = 'Psychology 102':
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end

locations/uni_lessons_electivesev1.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'computers_101':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/uni/classroom/comp_djibirl1.jpg"></center>'
 		if anushkaQW['djibril_sex'] >= 1:
 			'The class is pretty uneventful for the most part, but you notice Djibril sat next to Anushka. He''s flirting with her, but she''s really making him work for her attention, which you find a little amusing.'
-			'As Mr. Blagov finishes his lecture, he informs the class that he won''t be able to stay after to help anyone and if someone needs to ask him something, then they should come and see him in his office later or wait for the next class.' 
+			'As Mr. Blagov finishes his lecture, he informs the class that he won''t be able to stay after to help anyone and if someone needs to ask him something, then they should come and see him in his office later or wait for the next class.'
 			'With class finished, everyone gets up and heads for the exit. You glance back and see that Djibril has stopped Anushka and they''re talking by one of the computers.'
 			act 'Leave': gt 'uni_lessons', 'short_break'
 			act 'Wait for Anushka':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'computers_101':
 							act 'Keep watching':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/uni/classroom/comp_djibirl5.jpg"></center>'
-								'Anushka starts playing with her breasts as she bobs her head up and down on Djirbil''s dick. "Fuccck... You''re amazing at this," he moans out fairly loudly, which only encourages her to redouble her efforts and pick up the pace, making even more wet slurping sounds as she takes his cock deep into her mouth. "Oh, fuck yeah, just like that..." he moans out.' 
+								'Anushka starts playing with her breasts as she bobs her head up and down on Djirbil''s dick. "Fuccck... You''re amazing at this," he moans out fairly loudly, which only encourages her to redouble her efforts and pick up the pace, making even more wet slurping sounds as she takes his cock deep into her mouth. "Oh, fuck yeah, just like that..." he moans out.'
 								'She then pops his dick out of her mouth and gets off her knees. "My turn," she says as she sits on the table.'
 								gs 'arousal', 'voyeur_sex', 2
 								gs 'stat'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'computers_101':
 
 																			!! Evaluates time until 17:45 and grants study progress accordingly
 																			gs 'uni_lessons_electivesev1', 'study_with_friends'
-																			
+
 																			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 																			'You smile. "Yeah, that sounds like a good idea. Mind if I come?"'
 																			'She shrugs. "Sure, if you want, but I really do have to study." Her tone makes it clear she doesn''t have time to mess around like she did back in Pavlovsk.'
@@ -243,10 +243,10 @@ if $ARGS[0] = 'computers_101':
 																		act 'Ask if you can come along':
 																			*clr & cla
 																			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 																			!! Evaluates time until 17:45 and grants study progress accordingly
 																			gs 'uni_lessons_electivesev1', 'study_with_friends'
-																
+
 																			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 																			'You smile. "Yeah, that sounds like a good idea. Mind if I come?"'
 																			'She shrugs. "Sure, if you want, but I really do have to study." Her tone makes it clear she doesn''t have time to mess around like she did back in Pavlovsk.'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'computers_101':
 				*clr & cla
 				gs 'npc_relationship', 'modify', 'A144', 'like'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/lecture_hall/lecture_hall.jpg"></center>'
-				'You wait out in the hallway for a few minutes before Djibril comes out with Anushka. They''re talking and laughing together. "Catch you later, Nush." He stops when he sees you. "Hey <<$pcs_nickname>>, how you been? I got to go, but we should totally catch up. Later."' 
+				'You wait out in the hallway for a few minutes before Djibril comes out with Anushka. They''re talking and laughing together. "Catch you later, Nush." He stops when he sees you. "Hey <<$pcs_nickname>>, how you been? I got to go, but we should totally catch up. Later."'
 				'He walks away, giving you a friendly smile as he does. Once he''s gone, you turn to Anushka. "Hey, what''s up?"'
 				if npc_rel['A144'] >= 60:
 					'She looks a little surprised and gives you a puzzled look. "You know him?"'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Agree to go':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -343,7 +343,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -368,7 +368,7 @@ if $ARGS[0] = 'computers_101':
 				gs 'npc_relationship', 'modify', 'A144', 'like'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/lecture_hall/lecture_hall.jpg"></center>'
 				if npc_rel['A144'] >= 60:
-					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other, and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.' 
+					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other, and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.'
 					'Once he''s gone, you turn to Anushka. "Hey, what''s up?"'
 					if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
 						'She smiles as she sees you. "What up, slut?" You know she''s just being her normal playful self.'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'computers_101':
 					'"<<$pcs_nickname>>," you reply and you talk for a few minutes before he looks at his watch. "Shit, I need to get going, but it was nice meeting you." He hurries off without waiting for a reply.'
 					act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 				else
-					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.' 
+					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.'
 					'Once he''s gone, you turn to Anushka. "So who was that?"'
 					'She glances at you with a smirk. "Why do you care? You think he''s hot or something?"'
 					'You shrug as you walk with her. "I was just curious. You seemed to be flirting a lot."'
@@ -438,7 +438,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -489,7 +489,7 @@ if $ARGS[0] = 'comp_nush':
 		act 'Agree to go':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 			!! Evaluates time until 17:45 and grants study progress accordingly
 			gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -521,7 +521,7 @@ if $ARGS[0] = 'comp_nush':
 		act 'Ask if you can come along':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 			!! Evaluates time until 17:45 and grants study progress accordingly
 			gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -613,7 +613,7 @@ if $ARGS[0] = 'psychology_101':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra_resist.jpg"></center>'
 						'You shake your head. "Sorry mistress, I can''t... I''m not a whore that you can just pimp out."'
-						'An angry scowl appears on her face. "Listen you little fucking cunt, either get down on your knees or we''re done!"' 
+						'An angry scowl appears on her face. "Listen you little fucking cunt, either get down on your knees or we''re done!"'
 						act 'Obey': gt 'uni_lessons_electivesev1', 'obey_kendra'
 						gs 'willpower', 'humiliation', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -632,13 +632,13 @@ if $ARGS[0] = 'psychology_101':
 							end
 						else
 							act 'Refuse again (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end	
+						end
 					end
 				else
 					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-		end				
+		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
@@ -688,14 +688,14 @@ if $ARGS[0] = 'obey_kendra':
 				act 'Deepthroat':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra4.jpg"></center>'
-					'He places his hand on the back of your head as well, but instead of forcing your head forward he just holds it so you can''t pull away. He then forces his dick down your throat until your nose is pressing against his stomach and you can feel his balls against your chin. As you struggle to breathe, he pulls back and allows you to gasp before he does it again, letting up just enough so you can breathe.' 
+					'He places his hand on the back of your head as well, but instead of forcing your head forward he just holds it so you can''t pull away. He then forces his dick down your throat until your nose is pressing against his stomach and you can feel his balls against your chin. As you struggle to breathe, he pulls back and allows you to gasp before he does it again, letting up just enough so you can breathe.'
 					'"That''s it, choke this white slut with your black cock!"'
 					gs 'arousal', 'bj', 1, 'humiliation', 'sub', 'deepthroat', 'rough'
 					gs 'stat'
 					act 'Get face fucked':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra5.jpg"></center>'
-						'He starts roughly face fucking you, holding one hand on your head so you can''t pull away while Kendra lends a hand. You keep gasping and gagging as he shoves his dick down your throat.' 
+						'He starts roughly face fucking you, holding one hand on your head so you can''t pull away while Kendra lends a hand. You keep gasping and gagging as he shoves his dick down your throat.'
 						'"Okay, enough of that. Let the white slut stand up."'
 						'You feel her grab your hair and pull your head away until his dick pops out of your mouth, followed by her pulling you up into a standing position. "Get on your feet, slave!" she barks.'
 						gs 'arousal', 'bj', 1, 'humiliation', 'sub', 'deepthroat', 'rough'
@@ -754,8 +754,8 @@ end
 if $ARGS[0] = 'obey_kendra_offdesk':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra11.jpg"></center>'
-	'Once he pulls his dick out of you, you slide off the desk as your mistress commands, eager to obey her.' 
-	'"Kneel, slut!" she demands and you obediently drop to your knees as the guy comes over to stand next to you. "Now suck that nasty pussy juice of yours off his dick."' 
+	'Once he pulls his dick out of you, you slide off the desk as your mistress commands, eager to obey her.'
+	'"Kneel, slut!" she demands and you obediently drop to your knees as the guy comes over to stand next to you. "Now suck that nasty pussy juice of yours off his dick."'
 	'You open your mouth just in time for him to eagerly stick his cock back in your mouth. You do your best to slurp up all your pussy juices off it before she issues another command. "Stand up and bend over the desk." You again obey and do as your mistress commands.'
 	gs 'arousal', 'bj', 1, 'humiliation', 'sub'
 	gs 'stat'
@@ -764,14 +764,14 @@ if $ARGS[0] = 'obey_kendra_offdesk':
 		dick = 20
 		$dick_girth = 'thick'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra12.jpg"></center>'
-		'You bend over the desk, placing your elbows on the desk with your ass facing Kendra and the boy. You glance back to watch them, feeling very exposed and vulnerable standing like this in a classroom, knowing someone could come back at any moment. Kendra spreads your ass checks apart and spits on your asshole before she turns to the guy. "I want you to fuck this white slut''s asshole dry, fuck it raw until she cries." He gives her a slightly surprised look. "Do what I tell you! This white slut loves having her ass ripped apart by huge black cocks."' 
+		'You bend over the desk, placing your elbows on the desk with your ass facing Kendra and the boy. You glance back to watch them, feeling very exposed and vulnerable standing like this in a classroom, knowing someone could come back at any moment. Kendra spreads your ass checks apart and spits on your asshole before she turns to the guy. "I want you to fuck this white slut''s asshole dry, fuck it raw until she cries." He gives her a slightly surprised look. "Do what I tell you! This white slut loves having her ass ripped apart by huge black cocks."'
 		'When you don''t say anything, he moves up behind you and rubs the tip of his cock against your asshole. He pushes hard until the head of his cock pops painfully into your ass, causing you to gasp and whine in pain. "Go on, shove that big black cock of yours into that tiny tight asshole and rip it up!" Kendra barks as you close your eyes against the growing pain. You let out a pained yelp as his <<dick>>cm <<$dick_girth>> dick is shoved deeper into your unlubed asshole.'
 		gs 'arousal', 'anal', 2, 'humiliation', 'sub'
 		gs 'stat'
 		act 'Get your ass fucked':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra13.jpg"></center>'
-			'You hiss in pain as he finally bottoms his dick out in your ass. You feel his balls slap against the wet slit of your pussy as he starts roughly fucking your asshole. "That''s it, tear that little white asshole up!" Kendra says, sounding almost orgasmic. She climbs on the desk in front of you and backs her ass up to your face. You start to lick her pussy as your ass gets fucked, but she grabs your head and pulls it up until your tongue is licking her asshole. "Oooh yeah. Lick my ass, slut!"' 
+			'You hiss in pain as he finally bottoms his dick out in your ass. You feel his balls slap against the wet slit of your pussy as he starts roughly fucking your asshole. "That''s it, tear that little white asshole up!" Kendra says, sounding almost orgasmic. She climbs on the desk in front of you and backs her ass up to your face. You start to lick her pussy as your ass gets fucked, but she grabs your head and pulls it up until your tongue is licking her asshole. "Oooh yeah. Lick my ass, slut!"'
 			'You feel his hand join hers on the back of your head as he pushes your face deeper between her ebony cheeks.'
 			gs 'arousal', 'anal', 2, 'humiliation', 'sub', 'rough'
 			gs 'arousal', 'rimming', -2, 'humiliation', 'sub', 'rough'
@@ -793,7 +793,7 @@ end
 if $ARGS[0] = 'obey_kendra_takecum':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra15.jpg"></center>'
-	'Kendra suddenly pulls away from you. "Don''t cum in her ass!" she says and he pulls out of you, much to your relief. "Get down on your knees, slut!" she says while point at the floor next to her. You slide off the desk again and get down on your knees next to her before she kneels down behind you and reaches around to roughly pull your jaw so your mouth is open as wide as it will go. "Stick out your tongue, slut." You do as you''re told as she looks up at the guy. "Shoot your load in her dirty mouth."' 
+	'Kendra suddenly pulls away from you. "Don''t cum in her ass!" she says and he pulls out of you, much to your relief. "Get down on your knees, slut!" she says while point at the floor next to her. You slide off the desk again and get down on your knees next to her before she kneels down behind you and reaches around to roughly pull your jaw so your mouth is open as wide as it will go. "Stick out your tongue, slut." You do as you''re told as she looks up at the guy. "Shoot your load in her dirty mouth."'
 	'He stands in front of you stroking his dick while aiming at your face. A few seconds later, the first stream of cum hits your chin before the next one goes right into your open mouth. Several more follow, with some going in your mouth while others hit you in the face around your mouth. He finally lets out one more loud groan and then relaxes, having spent his full load.'
 	gs 'cum_call', 'face', 0
 	gs 'cum_call', 'mouth', 0
@@ -802,8 +802,8 @@ if $ARGS[0] = 'obey_kendra_takecum':
 		*clr & cla
 		gs 'fame', 'city', 'sex', 5
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra16.jpg"></center>'
-		'"Don''t swallow that prime African cum until I tell you to!" Kendra demands, so you stay perfectly still with your mouth full of cum, letting the cum from your chin drip onto her hand. "Why don''t you take a picture of this dirty fucking white slut covered in your cum so you can show all your friends?"' 
-		'He grins at the notion before grabbing his phone and taking a picture of you with his cum in your mouth as Kendra holds your mouth open. He takes several more pictures before he puts the phone down on the desk and starts getting dressed. Kendra gets up as well and starts to get dressed as well, looking down at you as she does. "Stay... And don''t swallow."' 
+		'"Don''t swallow that prime African cum until I tell you to!" Kendra demands, so you stay perfectly still with your mouth full of cum, letting the cum from your chin drip onto her hand. "Why don''t you take a picture of this dirty fucking white slut covered in your cum so you can show all your friends?"'
+		'He grins at the notion before grabbing his phone and taking a picture of you with his cum in your mouth as Kendra holds your mouth open. He takes several more pictures before he puts the phone down on the desk and starts getting dressed. Kendra gets up as well and starts to get dressed as well, looking down at you as she does. "Stay... And don''t swallow."'
 		'Once they''re both fully dressed and cleaned up, Kendra turns to you again while you still kneel on the floor naked covered in cum. "Swallow, slut!"'
 		act 'Swallow':
 			*clr & cla
@@ -824,25 +824,25 @@ if $ARGS[0] = 'obey_kendra_takecum':
 	end
 end
 
-!! This is a modified copy of the regular study code from uni_library. 
+!! This is a modified copy of the regular study code from uni_library.
 !! It will go down the list of classes to study, and determine if there is benefit from studying it
 !! If there isn''t, it will go down the list. If there are none left, it will give intel exp
 if $ARGS[0] = 'study_with_friends':
 
 	temp_hours_studied_with_friend = 1
-	if hour <= 13: 
+	if hour <= 13:
 		minut += 285 - minut
 		temp_hours_studied_with_friend = 5
-	elseif hour = 14: 
+	elseif hour = 14:
 		minut += 225 - minut
 		temp_hours_studied_with_friend = 4
-	elseif hour = 15: 
+	elseif hour = 15:
 		minut += 165 - minut
 		temp_hours_studied_with_friend = 3
-	elseif hour = 16: 
+	elseif hour = 16:
 		minut += 105 - minut
 		temp_hours_studied_with_friend = 2
-	elseif hour = 17 and minut < 45: 
+	elseif hour = 17 and minut < 45:
 		minut += 45 - minut
 		temp_hours_studied_with_friend = 1
 	end
@@ -854,7 +854,7 @@ if $ARGS[0] = 'study_with_friends':
 
 			if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
 				gs 'grades', 'optional_activity_attribute', '<<$class_list_institution[i]>>', '<<$class_list_name[i]>>', 'yes', '<<temp_hours_studied_with_friend>>'
-				
+
 			else
 				i += 1
 				if ARRSIZE('class_list_institution') >= i: jump 'study_with_friends_loop'
@@ -862,14 +862,14 @@ if $ARGS[0] = 'study_with_friends':
 				gs 'exp_gain', 'intel', rand(temp_hours_studied_with_friend - 1, (temp_hours_studied_with_friend + 1))
 			end
 
-		else 
+		else
 			i += 1
 			if ARRSIZE('class_list_institution') >= i: jump 'study_with_friends_loop'
 			killvar 'i'
 			gs 'exp_gain', 'intel', rand(temp_hours_studied_with_friend - 1, (temp_hours_studied_with_friend + 1))
 		end
 	end
-	
+
 	gs 'stat'
 	killvar 'temp_hours_studied_with_friend'
 end