11 Revize b5217e5c13 ... 08ae7f2fc2

Autor SHA1 Zpráva Datum
  Vengeance_11 08ae7f2fc2 Proofreading před 5 měsíci
  Vengeance_11 0dc00b570c "Fixed" image paths před 5 měsíci
  Kevin_Smarts 8e6959f82f [fixed] City dancer had bimbo trainers as default před 5 měsíci
  anjuna krokus 2b4e01c789 [added] Two more starting dates: August 1st and July 1st. Suggested by Selen99 před 5 měsíci
  anjuna krokus 12484cc868 [fixed] Therapist sex schedule. Removed floating spaces před 5 měsíci
  anjuna krokus 5bf4762735 [fixed] Moved "walk to the bus station" in pav_residential to lower in the list. Removed some floating spaces před 5 měsíci
  anjuna krokus ec45a2db9c Merge remote-tracking branch 'master/master' před 5 měsíci
  bgkjdgbizgblzdgbr 9664e4e106 [fixed] wipes will now work properly from the stat display. The cum eater icon is still not fixed. před 5 měsíci
  anjuna krokus b1940c1fd4 [fixed] hopefully fixed issue with the emp files conjured into existence when lusticon added killvars at the end of the file. Reported by AnimusGaming před 6 měsíci
  anjuna krokus 0253e47d88 Merge remote-tracking branch 'master/master' před 6 měsíci
  anjuna krokus 4b8d76fe72 [changed] spaces to tabs, fixes to trailing spaces/tabs, and more layout changes před 6 měsíci

+ 160 - 150
locations/emp_functions.qsrc

@@ -13,28 +13,28 @@
 !! --------------------- UI Interface for Journal
 
 if $ARGS[0] = 'gen_schedule':
-	*clr & cla 
+	*clr & cla
 	if theme['is_dark'] = 1:
 		$header_theme = '#91B0B4'
 		$body_theme = '#303030'
-		$body_theme_alt  = '#474747'
+		$body_theme_alt = '#474747'
 		$font_theme = '#000000'
 	else
 		$header_theme = '#e27c00'
 		$body_theme = '#E0DED4'
-		$body_theme_alt  = '#D58B32'
+		$body_theme_alt = '#D58B32'
 		$font_theme = '#FFFFFF'
 	end
-	if  function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
-	if function_sw = 2: 
+	if function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
+	if function_sw = 2:
 		gs 'journal', 'journalmenu'
 		'<center><h2>Work</h2></center>'
 	end
 	!! Enable selector if attending school or Uni by NPC group type or by character and set default to School
-	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1: 
+	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1:
 		if flag_schedule = 0: flag_schedule = 1
 		school_group = 1
-		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &  gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &  gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
+		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 & gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 & gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
 	else
 		!! Set schedule to holiday / non-edu NPCs
 		flag_schedule = 3
@@ -43,16 +43,16 @@ if $ARGS[0] = 'gen_schedule':
 	!! Initiate loop variables
 
 	i_day = 1
-    mod_max_day = 7
+	mod_max_day = 7
 	i_hour = ARGS[1]
-    mod_max_hour = ARGS[1] + 8 
-    header_switch = 1
-	killvar '$tablebody'   
+	mod_max_hour = ARGS[1] + 8
+	header_switch = 1
+	killvar '$tablebody'
 	killvar '$tableheader'
 
 	!! create header, using header switch to fill in :00 or :30 automatically using mod to determine odd/even and set display hour automatically.
 
-	$tableheader = '<tr border="1" align="center"  bgcolor="<<$header_theme>>"><th style="padding: 10px;"></th>'
+	$tableheader = '<tr border="1" align="center" bgcolor="<<$header_theme>>"><th style="padding: 10px;"></th>'
 	:jmp_header_create
 		if (i_hour mod 2) = 0:
 			display_hour = i_hour/ 2
@@ -61,30 +61,30 @@ if $ARGS[0] = 'gen_schedule':
 		if header_switch = 1:
 			header_switch += 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<<display_hour >>', display_hour) + ':00</font></th>'
-		elseif header_switch=2: 
+		elseif header_switch=2:
 			header_switch = 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
 		end
 		i_hour += 1
-	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
-	! Reset i_hour for next loop	
+	if i_hour <= mod_max_hour: jump 'jmp_header_create'
+	! Reset i_hour for next loop
 	killvar 'display_hour'
 	i_hour = ARGS[1]
 	header_switch = 1
 	!! Close out table header
 	$tableheader += '</tr>'
 	!! Create table body, with alternating colour rows for legibility
-    :jmp_day_create
+	:jmp_day_create
 
-        !Set day
-        if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
-			$tablebody += '<tr><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		!Set day
+		if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
+			$tablebody += '<tr><td style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		else
-			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		end
 		!! fill the slots from the NPC schedule
 
-        :jmp_hour_create 
+		:jmp_hour_create
 			if i_day >= 1:
 
 				!! Create function switcher:
@@ -93,15 +93,15 @@ if $ARGS[0] = 'gen_schedule':
 				!! 3: Event Tracker
 
 				if function_sw = 1 or function_sw = 0:
-					dynamic $schedule_tracker 
+					dynamic $schedule_tracker
 				elseif function_sw = 2:
-                    flag_active  = 1
-                    j_id = emp_rota_week['<<i_day>>_<<i_hour>>']
-                    if emp_rota_week['<<i_day>>_<<i_hour>>'] ! 0:							
-                        $transient_tb = '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
-                    else
-                        $transient_tb = 'Free'
-                    end
+					flag_active = 1
+					j_id = emp_rota_week['<<i_day>>_<<i_hour>>']
+					if emp_rota_week['<<i_day>>_<<i_hour>>'] ! 0:
+						$transient_tb = '<a href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+					else
+						$transient_tb = 'Free'
+					end
 				elseif function_sw = 3:
 				else
 					msg 'Error - Failed to create body. Please set content switch.'
@@ -110,49 +110,49 @@ if $ARGS[0] = 'gen_schedule':
 				if flag_active = 0:
 					$tablebody += '<td style="padding: 10px;">Slot: ' + i_hour +'</td>'
 				else
-					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
+					$tablebody += '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
-				end	
+				end
 				killvar '$transient_tb'
 			else
 				i_day += 1
 				jump 'jmp_day_create'
 			end
 			i_hour += 1
-            if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
+			if i_hour <= mod_max_hour: jump 'jmp_hour_create'
 			$tablebody +='</tr>'
 			i_day += 1
 			i_hour = ARGS[1]
-        if i_day <= mod_max_day: jump 'jmp_day_create'	
+		if i_day <= mod_max_day: jump 'jmp_day_create'
 	!! Create navigaton bars
-	if (mod_max_hour + 8)  <= 48:
+	if (mod_max_hour + 8) <= 48:
 		set_hour = ARGS[1] + 8
-		$msg_forward = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+		$msg_forward = '<a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
 	else
 		$msg_forward = 'End of Day'
 	end
-    if (mod_max_hour  - 8) >0 :
+	if (mod_max_hour - 8) >0 :
 		set_hour = ARGS[1] - 8
-        $msg_back = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
-    else
+		$msg_back = '<a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
+	else
 		$msg_back = 'Start of day'
-    end
+	end
 
-    !! Start the table constuction    
-    '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
-    '<<$msg_back>> | <<$msg_forward>>'
+	!! Start the table constuction
+	'<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
+	'<<$msg_back>> | <<$msg_forward>>'
 	killvar '$tablebody'
 	killvar '$tableheader'
 	killvar '$msg_back'
 	killvar '$msg_forward'
-    *nl
-    if  function_sw = 1:
-	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
+	*nl
+	if function_sw = 1:
+	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>'
 	end
-	if  function_sw = 2:
-		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>' 
+	if function_sw = 2:
+		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>'
 	end
-    act 'Back':
+	act 'Back':
 		killvar 'flag_schedule'
 		killvar 'school_group'
 		gt $loc, $loc_arg
@@ -163,11 +163,11 @@ end
 if $ARGS[0] = 'job_info':
 	j_id = ARGS[1]
 	killvar '$msg_body'
-	$msg_body +=  '<p>Job Title: ' + $emp_job_title[j_id] + '</p>'
+	$msg_body += '<p>Job Title: ' + $emp_job_title[j_id] + '</p>'
 	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
-	
+
 	msg '<<$msg_body>>'
 	killvar '$msg_body'
 end
@@ -187,45 +187,45 @@ if $ARGS[0] = 'evt_init' :
 	gt $loc, $loc_arg
 end
 
-if $ARGS[0] = 'disp_evt':	
+if $ARGS[0] = 'disp_evt':
 	if ARGS[1] = 1:
 		gs 'emp_functions','evt_day_suffix'
 
 		'I have this job for you do you want to acccept it?'
 		*nl
 		'Event Scheduled for: ' + transient_evt_day + $evt_suffix + ', '+ $monthName[transient_evt_month] +' '+ '20' + transient_evt_year
-		'Job: ' + $evt_job[transient_evt_type] 			
+		'Job: ' + $evt_job[transient_evt_type]
 		'Pay: ' + func('agentned', 'format_price_string', transient_evt_wages)
-		'Time: ' + transient_evt_hour + ':' +  iif(transient_evt_minutes  >= 0 and transient_evt_minutes <= 4, '00',  '30')
-		'Duration: ' + transient_evt_duration  + iif(transient_evt_duration  = 1, ' hour',  ' hours')
+		'Time: ' + transient_evt_hour + ':' + iif(transient_evt_minutes >= 0 and transient_evt_minutes <= 4, '00', '30')
+		'Duration: ' + transient_evt_duration + iif(transient_evt_duration = 1, ' hour', ' hours')
 		'Location: ' + $transient_journal
 		'Job Details: ' + $transient_desc
-		
+
 		act 'Accept the job' : gs 'emp_functions', 'cat_evt'
-		act 'Decline the job': 
-			gs 'emp_functions',  'del_evt', 1
+		act 'Decline the job':
+			gs 'emp_functions', 'del_evt', 1
 			gt 'emp_functions', 'evt_init'
 		end
 	end
 
 	!! create table for all jobs:
-	if ARGS[1] = 2:	
-		if arrsize('evt_event') > 0:			
+	if ARGS[1] = 2:
+		if arrsize('evt_event') > 0:
 			killvar '$evtbody'
-			job_idx = 0				
+			job_idx = 0
 			*nl
 			:jmp_list_create
 				if evt_silent[job_idx] = 1:
 					gs 'emp_functions','evt_day_suffix',evt_day[job_idx]
-					$evtbody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>' 
-					$evtbody += '<td>' + func('agentned', 'format_price_string', evt_wages[job_idx]) + '₽</td><td>' + evt_hour[job_idx] + ':' +  iif(evt_minutes[job_idx] >= 0 and evt_minutes[job_idx] <= 4, '00', '30') + '</td>'
-					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $evt_journal[job_idx] + '</td>'
-					$evtbody += '<td><a  href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
+					$evtbody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>'
+					$evtbody += '<td>' + func('agentned', 'format_price_string', evt_wages[job_idx]) + '₽</td><td>' + evt_hour[job_idx] + ':' + iif(evt_minutes[job_idx] >= 0 and evt_minutes[job_idx] <= 4, '00', '30') + '</td>'
+					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx] = 1, ' hour', ' hours') + '</td><td>' + $evt_journal[job_idx] + '</td>'
+					$evtbody += '<td><a href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
 				end
 				job_idx += 1
-				if job_idx < arrsize('evt_event') : jump 'jmp_list_create' 
-			if $evtbody ! '': 
-				'<center><h2>Current Task List</h2></center>'		
+				if job_idx < arrsize('evt_event') : jump 'jmp_list_create'
+			if $evtbody ! '':
+				'<center><h2>Current Task List</h2></center>'
 				$evtheader = '<tr><th>Date</th><th>Task</th><th>Pay</th><th>Time</th><th>Duration</th><th>Location</th><th>Cancel Job</th></tr>'
 				'<center><table width="90%" align="center" width="90%" cellspacing="5" cellpadding="5" valign="top"><tr><<$evtheader>><<$evtbody>></tr></table></center>'
 				killvar '$evtbody'
@@ -235,18 +235,18 @@ if $ARGS[0] = 'disp_evt':
 			end
 		end
 	end
-	
+
 	!! Display the location acts
 	if ARGS[1] = 3 and evt_chk = 1:
 		act_idx = 0
 		act_tracker = 0
 		act_found = 0
-		:jmp_act_create			
-			if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1): 
+		:jmp_act_create
+			if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1):
 				act_found = 1
-				act_idx = act_tracker 				
+				act_idx = act_tracker
 			end
-			act_tracker +=1 
+			act_tracker +=1
 		if act_found = 0:
 			if act_tracker < arrsize('evt_event'): jump 'jmp_act_create'
 		end
@@ -267,44 +267,44 @@ if $ARGS[0] = 'disp_evt':
 	end
 end
 
-if $ARGS[0] = 'gen_evt':	
+if $ARGS[0] = 'gen_evt':
 	!! Get the current year - remove 2000 to get the right year for search function.
 	transient_evt_year = year - 2000
-	
+
 	!! Figure out the month for the seed and ensure it rolls over into new calendar year.
-	if month = 12:			
+	if month = 12:
 		evt_mseed = 1
 		transient_evt_year += 1
 	else
 		evt_mseed = month + 1
 	end
 
-	!! randomise the month and month + 1 	
-	transient_evt_month = rand(month,  evt_mseed)      
+	!! randomise the month and month + 1
+	transient_evt_month = rand(month, evt_mseed)
 	:jmp_job_create
 		if transient_evt_month = month:
 			if (day + 7) > monthsend[transient_evt_month]:
 				transient_evt_month += 1
 				evt_dseed = 1
-			end	
+			end
 		else
 			evt_dseed = day + 1
-		end	
-		rnd_day = rand(evt_dseed, monthsend[transient_evt_month])	
-	if transient_evt_month  = month and rnd_day <= day: jump 'jmp_job_create'	
-					
+		end
+		rnd_day = rand(evt_dseed, monthsend[transient_evt_month])
+	if transient_evt_month = month and rnd_day <= day: jump 'jmp_job_create'
+
 	!! Set event transients - will be deleted upon completion
 	transient_evt_hour = rand(9, 20)
-	
+
 	!! For simplicity sake make minutes on the hour or at half hour intervals, store as a single int.
 	transient_evt_minutes = rand(0, 9)
-	
-	!! Set as multiples of 60 	
+
+	!! Set as multiples of 60
 	if transient_evt_duration = '':
 		transient_evt_duration = rand(1,8)
 	end
 	!! logic check for when randomising event duration
-	
+
 	if transient_evt_duration + transient_evt_hour >= 22:
 		transient_evt_hour = 22 - transient_evt_duration
 	end
@@ -314,22 +314,22 @@ if $ARGS[0] = 'gen_evt':
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
-		srch_day_l = monthsend[transient_evt_month]  - rand(7,14)
+		srch_day_l = monthsend[transient_evt_month] - rand(7,14)
 		if srch_day_l <= day: srch_day_l = day + 1
 	else
 		srch_day_l = rnd_day
 	end
 
 	:setdayloop
-	gs 'shortgs', 'dow',  transient_evt_year, transient_evt_month,  srch_day_l
-	if result =  transient_evt_dow: 
+	gs 'shortgs', 'dow', transient_evt_year, transient_evt_month, srch_day_l
+	if result = transient_evt_dow:
 		transient_evt_day = srch_day_l
 	srch_day_l = 99
-	else	        
-	srch_day_l += 1					
-	end 	
+	else
+	srch_day_l += 1
+	end
 
-	if srch_day_l <= srch_day_u: jump 'setdayloop'	
+	if srch_day_l <= srch_day_u: jump 'setdayloop'
 end
 
 ! ------ Helper Functions ------
@@ -348,38 +348,38 @@ end
 if $ARGS[0] = 'wage_evt':
 	!! calculate wages
 	!! Assume you''ll never earn less than 100 roubles
-	!! 0 for none, 1 - for a small payment (100-500),  2 - moderate payment (500-1000), 3 - large payment (1000-2000),  4 - huge payment (2000-4000)
+	!! 0 for none, 1 - for a small payment (100-500), 2 - moderate payment (500-1000), 3 - large payment (1000-2000), 4 - huge payment (2000-4000)
 	!! 5 is for custom payments
 	if ARGS[1] = 0:
 		transient_evt_wages = 0
 	elseif ARGS[1] = 1:
-		transient_evt_wages =  func('shortgs','round_tool',rand(100,500), 50)
+		transient_evt_wages = func('shortgs','round_tool',rand(100,500), 50)
 	elseif ARGS[1] = 2:
-		transient_evt_wages =  func('shortgs','round_tool',rand(500,1000), 50)
+		transient_evt_wages = func('shortgs','round_tool',rand(500,1000), 50)
 	elseif ARGS[1] = 3:
-		transient_evt_wages =  func('shortgs','round_tool',rand(1000,2000), 50)
+		transient_evt_wages = func('shortgs','round_tool',rand(1000,2000), 50)
 	elseif ARGS[1] = 4:
-		transient_evt_wages =  func('shortgs','round_tool',rand(2000,4000), 50)
+		transient_evt_wages = func('shortgs','round_tool',rand(2000,4000), 50)
 	elseif ARGS[1] = 5:
-		transient_evt_wages  = ARGS[2]
+		transient_evt_wages = ARGS[2]
 	end
 end
 
 if $ARGS[0] = 'cat_evt':
-	!! Construct Array Table  and clear transients when an event is created and accepted.
+	!! Construct Array Table and clear transients when an event is created and accepted.
 	!! Create global variables for the current live event.
 	!! Use 0 to create hidden events, 1 to show in journal
 	evt_silent[] = transient_evt_silent
 	!! Event job descriptor used in Journal
 	evt_event[] = transient_evt
-	!! Additional job ID if required 
+	!! Additional job ID if required
 	evt_event_sub[] = transient_evt_sub
 	!! Day of Week used in Journal and content areas
 	evt_dow[] = transient_evt_dow
 	!! Event Date to check against current date & used in Journal and content areas
 	evt_day[] = transient_evt_day
 	!! Event month to check against current month & used in Journal and content areas
-	evt_month[] =  transient_evt_month
+	evt_month[] = transient_evt_month
 	!! Event Year to check against year & used in Journal and content areas
 	evt_year[] = transient_evt_year
 	!! Event hour to check against hour & used in Journal and content areas
@@ -393,9 +393,9 @@ if $ARGS[0] = 'cat_evt':
 	!! Journal location as reminder
 	$evt_journal[] = $transient_journal
 	!! The following are event location triggers to allow the content to appear in areas such as community center but host their content elsewhere such as Photography shop
-	!! 	Event area triggers such as city_residential
+	!!	 Event area triggers such as city_residential
 	$evt_loc[] = $transient_loc
-	$evt_loc_arg[] = $transient_arg 
+	$evt_loc_arg[] = $transient_arg
 	!! Content location - optional
 	$evt_trigger_exec = $transient_evt_exec
 	$evt_trigger[] = $transient_trigger
@@ -404,7 +404,7 @@ if $ARGS[0] = 'cat_evt':
 	if transient_evt_silent = 1:
 		*clr & cla
 		'Job accepted, you currently have ' + arrsize('evt_event') + ' jobs assigned to you. Please look at your journal for more information.'
-		gs 'emp_functions',  'del_evt', 1
+		gs 'emp_functions', 'del_evt', 1
 		act 'Return': gt 'emp_functions', 'evt_init'
 	end
 end
@@ -417,35 +417,35 @@ if $ARGS[0] = 'del_evt':
 		killvar 'transient_event_type'
 		killvar 'transient_evt_year'
 		killvar 'transient_evt_month'
-		killvar 'transient_evt_hour'	
+		killvar 'transient_evt_hour'
 		killvar 'transient_evt_minutes'
 		killvar 'transient_evt_duration'
 		killvar 'transient_evt_wages'
 		killvar '$transient_loc '
 		killvar '$transient_arg'
-		killvar '$transient_trigger'	
+		killvar '$transient_trigger'
 		killvar '$transient_img'
 		killvar '$transient_desc'
-		killvar 'rnd_min'	
+		killvar 'rnd_min'
 		killvar 'mseed'
-		killvar 'dseed' 
+		killvar 'dseed'
 	end
 
 	! Delete array entry
 
 	if ARGS[1] = 2:
 		!! delete event after firing or cancelled.
-		!! killvar 'arr_name', index 
+		!! killvar 'arr_name', index
 		if ARGS[2] >= 0:
 			evt_idx = ARGS[2]
 			cla
-			'You''re about to delete this job: ' 
-			'Delete: ' + evt_event 
+			'You''re about to delete this job: '
+			'Delete: ' + evt_event
 			'Index: ' + evt_idx
 			Act 'Confirm?':
 				cla
 				'Are you sure?'
-				act 'Deleting': 
+				act 'Deleting':
 					cla
 					killvar 'evt_silent', evt_idx
 					killvar 'evt_event', evt_idx
@@ -465,18 +465,18 @@ if $ARGS[0] = 'del_evt':
 					killvar '$evt_desc', evt_idx
 
 					act 'Return': gs 'journal_work', 'start'
-				end 	 
+				end
 				act 'Cancel': gs 'journal_work', 'start'
 			end
 		else
 			'<<evt_idx>> - Invalid record - please check your index'
 		end
-	end 
+	end
 end
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '': 
+	if ARGS[1] ! '':
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -492,8 +492,8 @@ if $ARGS[0] = 'evt_day_suffix':
 		elseif test_day = 1 or test_day = 31:
 			$evt_suffix = 'st'
 		elseif test_day = 2:
-			$evt_suffix = 'nd'    
-		elseif test_day= 3: 
+			$evt_suffix = 'nd'
+		elseif test_day= 3:
 			$evt_suffix = 'rd'
 		else
 			$evt_suffix = 'th'
@@ -504,8 +504,8 @@ if $ARGS[0] = 'evt_day_suffix':
 	elseif day = 1 or day = 21 or day = 31:
 		$date_suffix = 'st'
 	elseif day = 2 or day = 22:
-		$date_suffix = 'nd'    
-	elseif test_day= 3: 
+		$date_suffix = 'nd'
+	elseif test_day= 3:
 		$date_suffix = 'rd'
 	else
 		$date_suffix = 'th'
@@ -522,7 +522,7 @@ if $ARGS[0] = 'evt_day_chk':
 	if evt_daily_chk ! daystart:
 		evt_daily_chk = daystart
 		job_idx = 0
-		:evt_day_chk		
+		:evt_day_chk
 			if month = evt_month and day = evt_day: evt_chk = 1
 			job_idx += 1
 		if job_idx < arrsize('evt_event') : jump 'evt_day_chk'
@@ -535,7 +535,7 @@ end
 !! book role, creates a time slot for emp_rota_week in format day_hour to be used in schedule mode.
 if $ARGS[0] = 'emp_booking':
 	gs 'emp_functions', 'emp_chk_clk'
-	if emp_rota_fail  = 0:	
+	if emp_rota_fail = 0:
 		gs 'emp_functions', 'loop_configure'
 		j_finish = emp_job_end[j_id]
 		:jmp_daily_book
@@ -543,7 +543,7 @@ if $ARGS[0] = 'emp_booking':
 			:jmp_hour_book
 				emp_rota_week['<<d_idx>>_<<j_idx>>'] = j_id
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			if j_idx <= j_finish: jump 'jmp_hour_book'
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		emp_job_status[j_id] = 1
@@ -559,22 +559,22 @@ if $ARGS[0] = 'emp_booking':
 	killvar 'emp_rota_fail'
 end
 
-!! check if time slots are avaialble for this role. 
-if $ARGS[0] = 'emp_chk_clk':	
+!! check if time slots are avaialble for this role.
+if $ARGS[0] = 'emp_chk_clk':
 	gs 'emp_functions', 'loop_configure'
 	j_finish = emp_job_end[j_id]
 	:jmp_daily_chk
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
 			if emp_rota_week['<<d_idx>>_<<j_idx>>'] > 0:
-				!! booking failed					
+				!! booking failed
 				emp_rota_fail = 1
 			else
 				!! booking passed
 				emp_rota_fail = 0
-			end	
-			j_idx +=1
-		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'	
+			end
+			j_idx += 1
+		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'
 		d_idx += 1
 	if d_idx <= d_end and emp_rota_fail = 0: jump 'jmp_daily_chk'
 end
@@ -588,42 +588,52 @@ if $ARGS[0] = 'emp_terminate':
 			:jmp_hour_book
 				emp_rota_week['<<d_idx>>_<<j_idx>>'] = 0
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			if j_idx <= j_finish: jump 'jmp_hour_book'
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		!! Set the termination value
 		emp_job_status[j_id] = ARGS[1]
 		emp_job[active] -= 1
 	else
-		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
+		msg 'Job termination failed. Please ensure you set to 4 - Terminated or 5 - Fired'
 	end
+	killvar 'j_idx'
+	killvar 'j_finish'
+	killvar 'd_idx'
+	killvar 'd_end'
 end
 
-if $ARGS[0] = 'loop_configure':	
-	if  j_day= 0 or j_day = 1 or j_day = 2:
+if $ARGS[0] = 'loop_configure':
+	if j_day => 0 and j_day <= 2:
 		d_idx = 1
 	else
-		d_idx= 6
+		d_idx = 6
 	end
-	if  j_day <= 1:
+
+	if j_day <= 1:
 		d_end = 5
 	else
-		d_end= 7
-	end	
+		d_end = 7
+	end
 end
 
-killvar 'i_day'
-killvar 'i_hour'
-killvar 'j_id'
-killvar 'j_idx'
-killvar 'j_day'
-killvar 'j_finish'
-killvar 'd_idx'
-killvar 'd_end'
-killvar 'evt_idx'
-killvar 'set_hour'
-killvar 'mod_max_day'
-killvar 'mod_max_hour'
-killvar 'header_switch'
+! Will need to figure out what we can do to clean this up
+!{
+if $ARGS[0] ! 'loop_configure':
+	killvar 'i_day'
+	killvar 'i_hour'
+	killvar 'j_id'
+	killvar 'j_idx'
+	killvar 'j_day'
+	killvar 'j_finish'
+	killvar 'd_idx'
+	killvar 'd_end'
+	killvar 'evt_idx'
+	killvar 'set_hour'
+	killvar 'mod_max_day'
+	killvar 'mod_max_hour'
+	killvar 'header_switch'
+end
+}
 
 --- emp_functions ---------------------------------

+ 17 - 14
locations/emp_job_array.qsrc

@@ -1,7 +1,7 @@
 # emp_job_array
 
 !! Jobs array
-!! < 4 hours is classed as ad-hoc work 
+!! < 4 hours is classed as ad-hoc work
 !! => 4 hours is contract roles
 !! Events are non-permanent employment of varying rates/times and set in the future.
 !!
@@ -15,31 +15,31 @@
 if $ARGS[0] = 'emp_tourist_guide':
 	!! Transitory variables to initialise job start - REQ
 	j_id = 1
-	
+
 	!! j_day defines work days: 1 - Mon-Sun, 2 Mon-Fr, 3 Weekend.  - REQ
 	j_day = 2
 
 	!! Role ID - Array index and used as job identifier.
 	emp_job_id[j_id] = 1
-	
+
 	!! Job Role	- REQ
-	$emp_job_title[j_id] = 'Tourist Guide' 
-	
+	$emp_job_title[j_id] = 'Tourist Guide'
+
 	!! Job start time - a day has 48 slots from base 0 - REQ
 	emp_job_start[j_id] = 16
-	
+
 	!! Job finish time - REQ
 	emp_job_end[j_id] = 32
-	
+
 	!! Job pay rate- REQ
 	emp_job_wages[j_id] = 1000
-	
+
 	!! Job employment location- REQ
 	$emp_job_loc[j_id] = 'Pavlosk Park'
-	
+
 	!! Job notes - to remind the player of the job details
 	$emp_job_notes[j_id] = 'Summer job with flexible days - start between 08:00 and 09:00'
-		
+
 	if emp_job_status[j_id] < 1:
 		!! Job status 1 Employed, 2 Started with favor, 3 Started with merit, 4 Terminated/suspended, 5 Fired permanently - REQ. <= 10 reserved for core mechanics, 10 + for custom quest markers
 		emp_job_status[j_id] = 0
@@ -48,7 +48,7 @@ if $ARGS[0] = 'emp_tourist_guide':
 		!! Job ranking system for promotions and career progression. - Opt
 		emp_job_rank[j_id] = 1
 	end
-	
+
 end
 
 if $ARGS[0] = 'emp_pav_maid':
@@ -60,7 +60,7 @@ if $ARGS[0] = 'emp_pav_maid':
 	emp_job_end[j_id] = 40
 	emp_job_wages[j_id] = 375
 	$emp_job_loc[j_id] = 'Pavlosk Park'
-	$emp_job_notes[j_id] = 'Be at the Pavlosk Hotel reception between 16:00-17:00 to start your shift.'		
+	$emp_job_notes[j_id] = 'Be at the Pavlosk Hotel reception between 16:00-17:00 to start your shift.'
 	if emp_job_status[j_id] < 1:
 		emp_job_status[j_id] = 0
 	end
@@ -88,7 +88,7 @@ if $ARGS[0] = 'emp_pussy_kats':
 	emp_job_wages[j_id] = 205
 	$emp_job_loc[j_id] = 'Pussy Cats'
 	$emp_job_notes[j_id] = 'Shop assistant at Pussy Cat''s in the City Center Mall. You''ve missed <<young_shop_miss>> day(s).'
-		
+
 	if emp_job_status[j_id] < 1:
 		emp_job_status[j_id] = 0
 	end
@@ -109,7 +109,7 @@ if $ARGS[0] = 'emp_titran':
 	emp_job_wages[j_id] = 1500
 	$emp_job_loc[j_id] = 'Titran-Express Engineering'
 	$emp_job_notes[j_id] = 'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on the 25th of each month.'
-		
+
 	if emp_job_status[j_id] < 1:
 		emp_job_status[j_id] = 0
 	end
@@ -121,7 +121,10 @@ if $ARGS[0] = 'emp_titran':
 	end
 end
 
+! Will need to figure out what we can do to clean this up
+!{
 killvar 'j_id'
 killvar 'j_day'
+}
 
 --- emp_job_array ---------------------------------

+ 159 - 167
locations/gschool_gossip.qsrc

@@ -2,7 +2,7 @@
 !!2022/07/02
 
 if $ARGS[0] = 'morning':
-!!will need the code for the new sonia gossip here in the morning
+	!! Will need the code for the new Sonia gossip here in the morning
 	if soniafall['gossip'] ! soniafall and soniafall > 0 and soniafall < 8: gs 'gschool_gossip', 'sonia_disco_gossip'
 	if sveta_dyke_rumor = 30 or sveta_dyke_rumor = 24 or sveta_dyke_rumor = 18 or sveta_dyke_rumor = 12 or sveta_dyke_rumor = 6 or sveta_dyke_rumor = 1:
 		gs 'gschool_gossip', 'sveta_dyke_rumors', 'picture'
@@ -12,17 +12,18 @@ if $ARGS[0] = 'morning':
 end
 
 if $ARGS[0] = 'skipping':
-	'On your way to hang out with your friends during lunch, you pass by small knots of your fellow students engaged in their own conversations. As you do, you overhear them talking about a variety of things, including some juicy gossip.'
+	'On your way to hang out with your friends during lunch, you pass by small groups of your fellow students engaged in their own conversations. As you do, you overhear them talking about a variety of things, including some juicy gossip.'
 	gs 'gschool_gossip', 'gossip'
 end
 
 if $ARGS[0] = 'bagged':
-	'You take your bagged lunch to one of the tables with an empty seat and sit there. While you''re eating your lunch, you can''t help but overhear some of the conversations going on around you. Your fellow students are talking about a variety of things, including some juicy gossip.'
+	'You take your bagged lunch to one of the empty tables and take a seat. As you''re eating your lunch, you overhear some of the conversations going on around you. Your fellow students are talking about a variety of things, including some juicy gossip.'
 	gs 'gschool_gossip', 'gossip'
 end
 
 if $ARGS[0] = 'buying':
-	'You stand in line to buy your lunch. While waiting in line, you chat to a few of your fellow students until you make your purchase. You then take your lunch tray and sit at one of the empty tables. While you''re eating your lunch, you can''t help but overhear some of the conversations going on around you. Your fellow students are talking about a variety of things, including some juicy gossip.'
+	'You stand in line to buy your lunch. While waiting in line, you chat to a few of your fellow students until you make your purchase. You then take your lunch tray and sit at one of the empty tables.'
+	'As you''re eating your lunch, you overhear some of the conversations going on around you. Your fellow students are talking about a variety of things, including some juicy gossip.'
 	gs 'gschool_gossip', 'gossip'
 end
 
@@ -52,18 +53,18 @@ if $ARGS[0] = 'gossip':
 			end
 			*nl
 			'"Did you hear what happened at the disco the other night? Sonia gave like five guys a blowjob, all at once!"'
-			'"Yeah, I heard. I don''t think anyone would want to go out with her any more now, not after Kotov and his cronies had their way with her."'
+			'"Yeah, I heard. I don''t think anyone will want to go out with her now, not after Kotov and his cronies had their way with her."'
 			'"What do you mean?"'
 			'"They all came right on her face and made her walk out like that. I bet half the town has seen pictures of her face covered in cum. It''s disgusting!"'
 		elseif soniaPS = 2:
 			*nl
-			'"Have you heard what Sonia is up to nowadays? Apparently she''s in the bathrooms during break giving out blowjobs to literally anyone!"'
-			'"Whoa, that''s nasty! Do you think we should go have a look today?"'
+			'"Have you heard what Sonia is up to nowadays? Apparently, she''s in the bathroom during break giving out blowjobs to literally anyone!"'
+			'"That''s nasty! Think we should go have a look?"'
 		elseif soniaPS = 3:
 			*nl
 			'"Sonia turned into a huge whore all of a sudden. She has all sorts of sex now, no matter how nasty! Such a shame."'
 			'"What do you mean, such a shame? Why do you even care?"'
-			'"Oh it''s nothing. I just used to like her a lot. Back in the ninth grade, she was such a prude. She wouldn''t even go on a date with me!"'
+			'"Oh it''s nothing. I just used to like her a lot, but she was such a prude back then that she wouldn''t even go on a date with me!"'
 		end
 	elseif fuckornot = 0:
 		fuckornot = 1
@@ -79,10 +80,10 @@ if $ARGS[0] = 'gossip':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip2.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
 		*nl
-		'A group of girls is clustered around a laptop. "Oh my god that''s disgusting! Boys are such pigs!" the first one says.'
+		'A group of girls are clustered around a laptop. "Oh my god, that''s disgusting! Boys are such pigs!" the first one says.'
 		'The second girl nods. "I know right? And the name, so disgusting! They could have at least called it Hot or Not."'
 		'"I heard some of the nerds made it and it was called Hot or Not, but then some of the other guys found out about it and made them rename it," a third girl adds in disgust.'
-		'They are silent for a few seconds before the second one asks "Where did I get rated?" They all start talking about where they are rated and where they think they should have been rated, and of course about how disgusting boys are.'
+		'They are silent for a few seconds before the second one asks where she''s rated. They all start talking about where they''re rated and where they think they should have been rated, and of course about how disgusting boys are.'
 	elseif hotornot = 0 and fuckornot_day < daystart - 9:
 		hotornot = 1
 		fuckornot_day = daystart
@@ -92,7 +93,7 @@ if $ARGS[0] = 'gossip':
 		*nl
 		'A group of girls are looking at their phones. "Can you believe these ratings?" one of them asks.'
 		'"Boys are such pigs!" another responds.'
-		'"We should return the favor and rate <i>them</i>," a third one says. The rest all stop and look at her, then to each other, and smile.'
+		'"We should return the favor and rate <i>them</i>," a third one says. The rest all stop and look at her, then at each other, and smile.'
 	elseif hotornot = 1 and fuckornot_day < daystart - 11:
 		hotornot = 2
 		fuckornot_day = daystart
@@ -107,7 +108,7 @@ if $ARGS[0] = 'gossip':
 		cheerleadingQW['gossip_day'] = daystart
 		'"Albina said that she knows Karine is skipping out on the squad to spend time with that dick she calls her boyfriend."'
 		'"Karine, the youngest one who wears purple all the time? Never understood why Albina even considered someone from a junior class."'
-		'"Yep, that one. Ever since she started dating that asshole, she''s been skipping out on cheerleading practice and not caring about her grades. I don''t know how Albina found out but she''s seriously pissed and threatening to kick her off the squad!"'
+		'"Yeah, her. Ever since she started dating that asshole, she''s been skipping out on cheerleading practice and not caring about her grades. I don''t know how Albina found out, but she''s seriously pissed and threatening to kick her off the squad!"'
 		'"I bet Lizaveta told her. Knowing Albina, I''d give Karine a month before her ass is given the boot."'
 		'"Girl, Albina will scratch her eyes out by the end of the week!"'
 	elseif cheerleadingQW['gossip_day'] < daystart and cheerleadingQW['gossip'] = 1:
@@ -161,84 +162,84 @@ if $ARGS[0] = 'mixed':
 		*nl
 	end
 	
-	chat_rand = rand(1, 95)
+	chat_rand = rand(1,95)
 	if chat_rand = 1:
 		'"Man, this town is so boring! We really need to graduate soon, so we can go live in the city!"'
-		'His friend heartily agrees. "Absolutely, I hear they have parties in the university hostel every day of the week!"'
+		'His friend heartily agrees. "Absolutely, I hear they have parties in the university dorm every day of the week!"'
 	elseif chat_rand = 2:
-		'"We went to the old town, it''s so boring. Just old buildings and a huge park, but I got a snog out of it, so not all bad."'
+		'"We went to the old town the other day and it''s <i>so boring</i>! Just old buildings and a huge park, but I got to make out with a hot guy there, so it wasn''t all bad."'
 	elseif chat_rand = 3:
 		'"I heard some of the older kids have a party every week. It''s all drinking and sex."'
 	elseif chat_rand = 4:
-		'"I swear there is a porn star who looks just like <<$pcs_firstname>>!"'
+		'"I swear there''s a porn star who looks just like <<$pcs_firstname>>!"'
 	elseif chat_rand = 5:
 		'"I was visiting a friend in the apartment complexes and saw a couple having sex right there in the stairwell."'
 	elseif chat_rand = 6:
-		'"I heard the volleyball coach from the center is fucking one of the girls on the team."'
+		'"I heard the volleyball coach is fucking one of the girls on the team."'
 	elseif chat_rand = 7:
-		'"My little brother plays football after school almost every day. They watch porn afterwards and he said that sometimes one of the girls from our class stops by and blows them all, but he won''t tell me who it is."'
+		'"My little brother plays football after school almost every day. They watch porn afterwards and he said that one of the girls from our class sometimes stops by and blows them all, but he won''t tell me who it is."'
 	elseif chat_rand = 8:
-		'"My cousin goes to college in the city and said there is a dorm whore who fucks all the black guys."'
+		'"My cousin goes to the university and said there''s a dorm whore who fucks all the black guys."'
 	elseif chat_rand = 9:
 		'"We were coming back from the city and I swear I saw someone who looked almost exactly like <<$pcs_firstname>> standing around with all the whores near the highway."'
 	elseif chat_rand = 10:
 		'"I heard Mr. Kuznetsov has a big dick. One of the girls was cutting class in the mens room and spied on him taking a piss. She said his dick nearly hung down to his knees."'
 	elseif chat_rand = 11:
 		'"I heard Mr. Kuznetsov hates it here and was trying to get a transfer, but Miss Volkov blocked it and now they hate each other."'
-		'"Really? I heard they were fucking at school."'
+		'"Really? I heard they were fucking each other."'
 	elseif chat_rand = 12:
 		'"A friend said her mom overheard Mrs. Tsarev telling someone that Mr. Tsarev has a little dick and that''s why she won''t have sex with him anymore."'
 	elseif chat_rand = 13:
 		'"I heard Mr. Tsarev is not a happily married man and they might be getting a divorce. I feel sorry for Lera."'
 	elseif chat_rand = 14:
 		'"I heard Mr. Ivanov cornered one of the girls in the bathroom and threatened to have her expelled if she didn''t suck his dick."'
-		'"Yeah I heard that too and that he has a huge dick. I also heard that he fucked her in the ass until she cried."'
+		'"Yeah, I heard that too. I also heard that he fucked her in the ass until she cried."'
 		'"Fucking bastard!"'
 	elseif chat_rand = 15:
 		'"Mr. Ivanov is such an asshole! He''s always giving the nerds special treatment while fucking with the rest of us. I got Artem to write my paper and barely got a passing grade on it while he got a perfect score on his!"'
 		'"I always knew he''s harder on anyone that isn''t a nerd. I heard it''s because he was a nerd in school and was always picked on."'
-		'"Yeah I can imagine that. He looks like a loser."'
+		'"Yeah, I can imagine that. He looks like a loser."'
 	elseif chat_rand = 16:
 		'"I heard Marcus'' dick is bigger than most girls arms and he has to tape it to his leg during gym class to keep it from falling out of his shorts."'
 	elseif chat_rand = 17:
-		'"I heard Marcus tries to lure girls to the city, where he takes them to the university dorms and all the black guys gang bang her."'
+		'"I heard Marcus tries to lure girls to the city, where he takes them to the university dorm and all the black guys gang bang her."'
 	elseif chat_rand = 18:
 		'"I heard Marcus is a sex fiend who always has a hard-on."'
 		'"Well, I heard it''s because all the girls like to tease him because they think it''s funny."'
 	elseif chat_rand = 19:
-		'"I heard the only reason Marcus is here is because he wants to find a nice Russian girl to marry and take her back to America."'
+		'"I heard the only reason Marcus is here is because he wants to find a nice Russian girl to marry and take back to America."'
 		'"That''s not what I heard. I heard he came here because he thought all the Russian girls would want to jump on his dick because he''s black."'
 	elseif chat_rand = 20:
 		'"I heard that Mr. Vasilyev is gay and that he came onto some of the guys after school."'
 		'"Ugh, he shouldn''t be allowed to teach here."'
 	elseif chat_rand = 21:
-		'"I heard Miss Volkov has a drawer full of sex toys she has confiscated from students."'
+		'"I heard Miss Volkov has a drawer full of sex toys she''s confiscated from students."'
 	elseif chat_rand = 22:
-		'"I heard Miss Volkov uses a strap-on on her students if she feels the paddle isn''t working."'
-		'"Really? Well, I guess the gopniks would know." They both laugh at that.'
+		'"I heard Miss Volkov uses a strap-on if she feels the paddle isn''t working."'
+		'"Really? Well, I guess the gopniks would know..."'
 	elseif chat_rand = 23:
 		'"I heard Miss Volkov used to work as a Dominatrix."'
 		'"I heard she still does on the weekends."'
 	elseif chat_rand = 24:
-		'"Man, Mrs. Sokoloff is so old, they built the old school around her and they had to force her to move her class to the new building."'
+		'"Mrs. Sokoloff has been teaching so long I swear they built the old school building around her."'
 	elseif chat_rand = 25:
-		'"I was in the city last week and I saw Ms. Braakman at a club partying like crazy."'
-		'"I heard she is a total party animal and that she goes to the city on Friday night and doesn''t come home until Sunday night and parties the whole time."'
+		'"I was in the city last week and saw Ms. Braakman at a club partying like crazy!"'
+		'"I heard she''s a total party animal who goes to the city on Friday night and doesn''t come home until Sunday afternoon."'
 	elseif chat_rand = 26:
-		'"I heard when Ms. Braakman''s husband was still alive, they were swingers, but now she just goes to orgies."'
+		'"I heard Ms. Braakman and her husband were swingers, but now she just goes to orgies."'
 	elseif chat_rand = 27:
 		'"I heard Ms. Braakman killed her husband and made it look like an accident."'
 	elseif chat_rand = 28:
 		'"A girl told me she went to the supply closet to get paper towels and found the janitor in there, jerking off."'
-		'"Aw, that''s sick."'
-		'"She also said he had a little dick that was barely big enough for him to fit his hand around." They start laughing at that.'
+		'"Eww, that''s gross!"'
+		'"She also said he had a little dick that was barely big enough for him to fit his hand around."'
 	elseif chat_rand = 29:
 		'"I heard the janitor goes through the girls lockers and steals their panties if they leave them at school."'
 	elseif chat_rand = 30:
 		'"I heard the janitor drilled a hole in the wall of the girls shower in the gym and spies on them when they take a shower."'
 	elseif chat_rand = 31:
 		'"Oh man, did you hear what happened to Igor?"'
-		'"About him getting his shorts pulled down? Yeah, I also heard he had a tiny dick and that it wasn''t much bigger than a girl''s clit."'
+		'"About him getting his shorts pulled down? Yeah, I also heard he had a tiny dick that wasn''t much bigger than a girl''s clit."'
 	elseif chat_rand = 32:
 		'"Man, Andrey is such an asshole!"'
 		'"Why?"'
@@ -264,9 +265,9 @@ if $ARGS[0] = 'mixed':
 		'"Don''t let her hear you say that! If she doesn''t beat you up, then her dad will ruin your dad!"'
 	elseif chat_rand = 40:
 		'"If you ever want to know the latest gossip, just ask Lizaveta. That girl seems to know every bit of gossip and never shuts up about it."'
-		'Their friend laughs. "I heard she even mutters about gossip in her sleep."'
+		'Their friend laughs. "I heard she even mutters about gossip in her sleep!"'
 	elseif chat_rand = 41:
-		'"Don''t cross Lizaveta or she will totally ruin your reputation by spreading gossip about you."'
+		'"Don''t cross Lizaveta or she''ll totally ruin your reputation by spreading gossip about you."'
 	elseif chat_rand = 42:
 		'"I heard Ivan''s dad skipped town when he was young and now his mom works two jobs to support him and his brother and sister."'
 	elseif chat_rand = 43:
@@ -275,10 +276,10 @@ if $ARGS[0] = 'mixed':
 		'"That, and the fact she''s completely cold hearted with no emotion at all."'
 	elseif chat_rand = 44:
 		'"I heard Lazar has a box full of girls panties at his house."'
-		'"What? He wears girls panties?"'
-		'The first boy sighs. "No, he takes the panties of all the girls he fucks for the first time, like a trophy."'
-		'"Oh... How many does he have?"'
-		'"I heard a couple dozen and by the time school is over, he plans to add a pair from every girl in school... Well, at least from the pretty girls."'
+		'"He wears girls panties?"'
+		'"What? No! He takes the panties of all the girls he fucks for the first time, like a trophy."'
+		'"Oh. How many does he have?"'
+		'"I heard he''s at a couple dozen, and that by the time school is over, he plans to have a pair from every girl. Well, at least from the pretty girls."'
 	elseif chat_rand = 45:
 		'"I heard Erast is taking steroids and that''s why he''s so big and strong."'
 	elseif chat_rand = 46:
@@ -288,41 +289,39 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 48:
 		'"I saw Feofan walking around in a costume over the weekend."'
 		'"Yeah, he likes to dress up and go to those conventions and stuff."'
-		'"No I mean he was just walking around town all dressed up. I wasn''t sure it was him at first until he said something to me."'
+		'"No, I mean he was just walking around town all dressed up. I wasn''t sure it was him at first until he said something to me."'
 		'"Man, he is weird."'
 	elseif chat_rand = 49:
 		if natbelQW['FriendLover'] < 7:
 			'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
 			'"She''s been wearing the same clothes for the last few years and always brings a lunch from home."'
 		else
-			'"I know Natasha''s mom must be super poor. Until recently, she''s been wearing the same school uniform she had last year."'
-			'"She''s been wearing the same clothes for the last few years and always brings a lunch from home."'
-			'"Yeah, I hear she''s been hanging out with <<$pcs_nickname>> recently, too. I think I saw them walking holding hands in the park a while back."'
-			'"I guess <<$pcs_nickname>> has been buying the stuff for her then?"'
-			'"Lesbians!"'
-			'I don''t know. Maybe but there were rumors awhile back that she was hanging around with Lazar."'
+			'"Natasha''s mom must be super poor. Until recently, she was wearing the same school uniform she had last year."'
+			'"Yeah, I hear she''s been hanging out with <<$pcs_nickname>> recently. I think I saw them holding hands in the park a while back."'
+			'"I guess <<$pcs_nickname>>''s been buying stuff for her then. Think they''re lesbians?"'
+			'I don''t know. I guess so, but there were rumors a while back that she was hanging around with Lazar too."'
 		end
 	elseif chat_rand = 50:
 		if NatbelQW['chrispaid'] = 3:
-			'"Did you hear the latest? Apparently Natasha is repaying her debts!"'
-			'"I find that hard to believe. She''s almost as bad of a mooch as Petia is. Not to mention, I heard she still owes Christina and she was getting tired of waiting to get paid back. I wouldn''t want to owe her anything."'
-			'"Not according to Lizaveta. She said that <<$pcs_nickname>> paid her debt for her and she''s rarely wrong."'
-			'"Yeah? She did repay me fifty rubles recently, but I doubt this changes anything. No doubt she''ll be asking for money again within a week or two."'
+			'"Did you hear the latest? Natasha is apparently repaying her debts!"'
+			'"I find that hard to believe. I heard she still owes Christina, who''s getting tired of waiting."'
+			'"Not according to Lizaveta. She said that <<$pcs_nickname>> paid her debt for her, and she''s rarely wrong."'
+			'"I doubt this changes anything, though. She''ll be asking for money again within a week or two."'
 		else
-			'"Whatever you do, don''t loan money to Natasha. She''ll never pay you back. I lent her fifty rubles and I doubt I''ll ever see it again."'
+			'"Whatever you do, don''t loan money to Natasha. She''ll never pay you back. I lent her 50 <b>₽</b> and I doubt I''ll ever see it again."'
 			'"I heard one of the guys threatened her and told her to get his money or she better start blowing him, so she dropped right to her knees and sucked him off."'
-			'"Bullshit! No way, really? Hmmm... Maybe I better ask her for my money again..."'
+			'"Seriously? Hmmm... Maybe I better ask her for my money again..."'
 		end
 	elseif chat_rand = 51:
 		'"Radomir acts like he''s already the next Yuri Shatunov. I mean, he''s okay but he''s nowhere near as good as he likes to think he is."'
-		'"I don''t know... He''s pretty good and so is his band."'
+		'"I don''t know... He''s pretty good, and so is his band."'
 	elseif chat_rand = 52:
 		'"Man, I can''t believe how much Lavrenti has changed. He used to be so much cooler back before he went all gopnik."'
 		'"I heard it was because he was in love with some girl, and Dimka knew it. So he got her drunk, fucked her every which way and filmed it to show Lavrenti that she was a slut."'
 		'"Damn! Well, I guess Dimka was right though, if she let him film her while he fucked her."'
 	elseif chat_rand = 53:
 		'"I heard Lena is a lesbian."'
-		'"Well, I heard it''s only because Vitek has beat the shit out of every guy that has ever even looked at her."'
+		'"Yeah, I heard it''s because Vitek has beat the shit out of every guy who''s ever looked at her."'
 	elseif chat_rand = 54:
 		'"I heard Lera is a lesbian."'
 		'"Yeah, I heard she spends most of her time going down on Lena when they''re alone together."'
@@ -330,25 +329,25 @@ if $ARGS[0] = 'mixed':
 		'"I heard Lesco is a fag."'
 		'"He sure looks and acts like he''s gay. I believe it."'
 	elseif chat_rand = 56:
-		'"I heard the only reason his uncle took him in is because his mom is a whore and was so strung out on drugs, she left him alone for two weeks."'
-		'"I don''t blame her. If I had a son that looked like him, I would stay high all the time too."'
+		'"I heard the only reason Lesco''s uncle took him in is because his mom is a whore who was so strung out on drugs, she left him alone for two weeks."'
+		'"I don''t blame her. If I had a son that looked like that, I''d be high all the time too."'
 	elseif chat_rand = 57:
 		'"Oh god, avoid Petia the mooch today! He smells worse than usual. Does that fat loser ever take a bath or brush his teeth?"'
-		'"I swear I would rather fart in my gym sock and smell it than go anywhere near that thing."'
+		'"I swear I''d rather fart in my gym sock and smell it than go anywhere near that thing."'
 	elseif chat_rand = 58:
 		'"I bet Radomir is happy his band has their first groupie. Alyona is always hanging out with them and going to all their gigs."'
 		'"I heard she lets the whole band, including Anushka, pull trains on her."'
 		'"Dude, better be careful saying that or she might stab you with that knife she always carries around."'
 	elseif chat_rand = 59:
 		'"I saw Alyona stumbling home last night, drunk off her ass, probably fucked up on drugs too. I offered to help her and the bitch pulled a knife on me."'
-		'"Yeah, all she ever does anymore is get drunk, do drugs, fight and fuck. Just like her parents."'
+		'"Yeah, all she ever does is get drunk, do drugs, fight and fuck. Just like her parents."'
 	elseif chat_rand = 60:
 		'"Anushka is such a slut. I saw her giving Radomir a handjob in class the other day and she''s always making out with Alyona. I bet the whole band pulls trains on the slut every night."'
 		'"Shh, not so loud! The last person to call her a slut got their ass beat by the gopniks."'
 	elseif chat_rand = 61:
 		'"I heard Anushka is a real honest to god nympho and if she isn''t getting fucked three times a day, she isn''t happy."'
 		'"Well, I guess she doesn''t get fucked three times a day most days. Most of the time, she''s a total bitch to me."'
-		'"Well, offer to fuck her next time. I bet she would take you up on it. Or beat your ass. Maybe both."'
+		'"Well, offer to fuck her next time. I bet she''d take you up on it. Or beat your ass. Maybe both."'
 	elseif chat_rand = 62:
 		'"Did you catch the fight in the park over the weekend?"'
 		'"No, who was fighting?"'
@@ -365,19 +364,19 @@ if $ARGS[0] = 'mixed':
 		'"I can''t believe you aced the homework."'
 		'"I should have! Gerasim done it."'
 	elseif chat_rand = 66:
-		'"I heard Lina is sucking Mr. Pavlovich''s dick."'
+		'"I heard Lina is sucking Coach Pavlovich''s dick."'
 		'"I heard it was Christina."'
 	elseif chat_rand = 67:
 		'"Yeah, Vicky climbed into my mum''s old chest and pulled the lid shut."'
 		'"How the hell did she get in that?"'
-		'"How should I know? She would make a good magician''s assistant."'
+		'"How should I know? She''d make a good magician''s assistant."'
 	elseif chat_rand = 68:
 		'"Hey, do you know where Christina went last Friday after PE?"'
-		'"Yeah, she told me she was out on the athletics field with Mr. Pavlovich."'
-		'"Again? She does this every Friday now. What are they up to?"'
+		'"Yeah, she told me she was out on the athletics field with Coach Pavlovich."'
+		'"Again? She does this every Friday! What are they up to?"'
 		'"I don''t know. Maybe he''s giving her some private training sessions or something? There''s got to be a reason she keeps winning those dashes."'
 	elseif chat_rand = 69:
-		'"Did you notice the way Mr. Pavlovich stared at the principal during the last assembly?"'
+		'"Did you notice the way Coach Pavlovich stared at the principal during the last assembly?"'
 		'"Yeah, he seemed completely zoned out. And I think she noticed towards the end!"'
 		'"Really? I didn''t see that. How did she react?"'
 		'"I think she... smiled at him."'
@@ -392,14 +391,14 @@ if $ARGS[0] = 'mixed':
 		'"To the city."'
 		'"What?"'
 		'"She takes the train to the city. I saw her board it a couple of times."'
-		'"What would she want in the city every day?"'
+		'"What could she possibly be doing in the city every day?"'
 		'"I think she takes singing lessons or something."'
 		'"With a voice like hers, she probably sucks him off so he doesn''t run out."'
 	elseif chat_rand = 72:
 		if christinaQW['fight'] >= 1:
-			'"Did you hear Christina got her ass beat?"'
-			'"I was there! That girl tore Christina to pieces!"'
-			'"Good, if anybody had it coming, it was her."'
+			'"Did you hear Christina got her ass kicked?"'
+			'"I was there! That girl tore her to pieces!"'
+			'"Good. If anybody had it coming, it was her."'
 		else
 			'"Every time I see Lina, I just want to punch her."'
 			'"Come on, she''s not that bad."'
@@ -409,13 +408,13 @@ if $ARGS[0] = 'mixed':
 		end
 	elseif chat_rand = 73:
 		'"I''m telling you, Julia was trying to kiss a girl!"'
-		'"But, who was it?"'
+		'"Who was it?"'
 		'"I don''t know. I couldn''t see her face."'
 		'"And how do you know it was a girl?"'
 		'"Do you see any of the guys walking around in a skirt?"'
 		'"Fair point. What happened next?"'
 		'"The girl shoved her away and left."'
-		'"Well, at least it explains why Julia keeps giving the boys the cold shoulder."'
+		'"So that''s why she keeps giving the boys the cold shoulder..."'
 	elseif chat_rand = 74:
 		'"... I''m not saying he wasn''t being a dick, but... You know, everybody is, sometimes."'
 		'"I don''t get it. Why do you keep defending Dan? He''s one of the biggest assholes in school!"'
@@ -487,11 +486,11 @@ if $ARGS[0] = 'mixed':
 		'"Story is he tried to do that to someone else, and she won."'
 		'"That''s quite a win."'
 	elseif chat_rand = 86:
-		'"I saw some boys at the sports field talking to an older girl this weekend before they snuck off somewhere. I wonder what they were up to?"'
+		'"I saw some boys at the sports field talking to an older girl before they snuck off somewhere. I wonder what they were up to?"'
 	elseif chat_rand = 87:
 		'You hear some students whispering about something. "Did you hear about the jocks having a secret pick up game every weekend?"'
 		'The other student nods. "Yeah, I heard they don''t let anyone else join unless they belong to that clique..."'
-		'They continue whispering that it would be nice to join in the pick up games at least once.'
+		'They continue whispering that it would be nice to join in at least once.'
 	elseif chat_rand = 88:
 		'"You know how the gopniks sometimes grab at girls during class? Usually the girls hate it, but this one girl the other day... Oh man, did she seem to enjoy it!"'
 	elseif chat_rand = 89:
@@ -499,8 +498,8 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 90:
 		'"Ever notice how everyone seems obsessed with sex?"'
 		'"What, you''re not?"'
-		'"No I mean everyone. Anyways, I heard my grandmother talking to some of the other old women the other day and they were talking about how the area is cursed. They were talking about how apparently some lust demon was killed here long ago and it''s blood tainted the area, making everyone sex crazed."'
-		'The other student laughs. "Your grandmother is crazy, I want some of what she''s taking. Magic and demons aren''t real."'
+		'"No, I mean <i>everyone</i>. Anyway, I heard my grandmother talking to some of the other old women the other day and they were talking about how the area is cursed. They were talking about how apparently some lust demon was killed here long ago and it''s blood tainted the area, making everyone sex crazed."'
+		'The other student laughs. "Your grandmother is crazy! I want some of what she''s taking. Magic and demons aren''t real!"'
 		'"So you don''t believe in god and stuff? I mean if that''s all real, why wouldn''t demons and stuff be?"'
 		'They both go silent, as if really considering it'
 	elseif chat_rand = 91 and cheerleadingQW['quest_stage'] < 0 and cheerleadingQW['try_count'] > 0:
@@ -540,10 +539,10 @@ if $ARGS[0] = 'boys':
 		*nl
 	end
 
-	chat_rand = rand(1, 45)
+	chat_rand = rand(1,45)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!"' 
-		'His friend doesn''t seem impressed and scoffs back "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin if your life depended on it."'
+		'His friend doesn''t seem impressed. "I''ve seen you play before," he scoffs. "You couldn''t carry a paper bag to the litter bin if your life depended on it!"'
 	elseif chat_rand = 2:
 		'"Double rainbows man... What do they even mean?"'
 	elseif chat_rand = 3:
@@ -569,25 +568,25 @@ if $ARGS[0] = 'boys':
 		'"Get in line! She''s hotter than any of the girls in school."'
 	elseif chat_rand = 12:
 		'"Miss Volkov is kind of hot. I mean, for someone almost as old as my mom."'
-		'"I hear you. She is a total MILF."'
+		'"I hear you. She''s a total MILF."'
 	elseif chat_rand = 13 and katjaQW['school_kiss'] > 2:
 		'"Did you see the picture of Katja kissing another girl?"'
 		'"Katja''s a lesbian? And no, let me see the picture." They look at the image on a phone. "Who''s she kissing?"'
 		'"I don''t know. I heard it was <<$pcs_firstname>>."'
-		'"Fuck they''re both lesbians? That sucks."'
+		'"Fuck, they''re both lesbians? That sucks."'
 		'"Well I heard Ivan fucked them both, so I think they''re both bi."'
 		'"Sweet... Lucky bastard."'
 	elseif chat_rand = 14:
 		'"I heard Ivan only fucks girls in the ass and they all seem to be lining up to let him do it."'
-		'"I wonder how he convinces them to take it? Maybe we should ask him what his secret is?"'
+		'"I wonder how he convinces them? Maybe we should ask him what his secret is?"'
 	elseif chat_rand = 15:
 		'"I heard Sokolov is a lesbian."'
 		'"I heard she has no interest in sex at all. Some of the girls even hit on her too. A real shame. She''s cute."'
 	elseif chat_rand = 16:
 		'"Man, I can''t believe all the girls let Lazar fuck them. It''s not fair, I mean what does he have that I don''t?"'
 !Opposites at the end.
-		'His friend laughs. "You mean other than good looks, smarts, captain of the football team, a huge dick, money, a car and in great shape? Other than that, he''s got nothing on you."'
-		'"Haha, very funny. Yeah okay, maybe he has some stuff that I don''t, but he''s also a total asshole to the girls and I''m nice to them. Being a nice guy has to count for something, right?"'
+		'His friend laughs. "You mean other than having good looks, a huge dick and being captain of the football team who''s in great shape? Oh, he''s got nothing on you."'
+		'"Haha, very funny. Yeah okay, maybe he''s good looking, but he''s also a total asshole to the girls and I''m nice to them. Being a nice guy has to count for something, right?"'
 		'His friend shrugs. "Girls like bad boys, plus I think most of them secretly love being treated like the sluts they are, no matter what they tell us."'
 	elseif chat_rand = 17:
 		'"Vitek almost got expelled. Some guy started talking to his sister Lena and he shoved him to the ground and almost started a fight, but the teachers broke it up. That poor guy is going to get his ass beat later when Vitek catches him away from school."'
@@ -601,8 +600,8 @@ if $ARGS[0] = 'boys':
 		'"Holy shit, are you serious?"'
 	elseif chat_rand = 20:
 		'"Lena''s kind of hot."'
-		'"Are you crazy? You know what Vitek would do to you if he heard you were eyeing his sister?"'
-		'"Yeah yeah, but I bet she''s so fucking horny she would let you do anything you want to her. It would be totally worth it!"'
+		'"Are you crazy?! You know what Vitek would do to you if he heard you were eyeing his sister?"'
+		'"Yeah yeah, but I bet she''s so fucking horny that she''d let you do anything you want to her. It would be totally worth it!"'
 	elseif chat_rand = 21:
 		'"Dude, you missed it. The other day Anushka goes up to the teacher during class and leans over his desk to ask him a question. While she''s doing it, she pulls up her skirt and pulls her panties down, mooning the whole class."'
 		'"Damn. Did you take a picture?"'
@@ -613,7 +612,7 @@ if $ARGS[0] = 'boys':
 		'"Ever since I smiled at Vicky, I''ve had Vanya glaring at me everywhere I go."'
 	elseif chat_rand = 24:
 		'"Did you see Bella in gym class?"'
-		'"Of course I did. There wasn''t a guy there who didn''t have a boner."'
+		'"Of course I did. There wasn''t a guy there who didn''t have a boner!"'
 	elseif chat_rand = 25:
 		'"I bet Zinaida has some big ones hiding under that baggy shirt."'
 	elseif chat_rand = 26:
@@ -679,7 +678,7 @@ if $ARGS[0] = 'boys':
 		'"Say what? I didn''t say anything."'
 	elseif chat_rand = 33 and fedorKozlovQW <= -10:
 		'"I never took Fedor for a cocksucker, but it does explain why he used to spend so much time with Ivan. You don''t think Ivan is..."'
-		'"No way! After Fedor sucked Shulga''s dick, Ivan punched the first guy who asked him "Isn''t that your friend?""'
+		'"No way! After Fedor sucked Vasily''s dick, Ivan punched the first guy who asked him "Isn''t that your friend?""'
 		'"Whoa. I''m glad I didn''t ask him that. You might have just saved me from a broken jaw."'
 		'"Speaking of broken jaws, we should probably stop talking before he hears us."'
 	elseif chat_rand = 34 and fedorKozlovQW = -15 and kotovLoveQW > 0:
@@ -690,7 +689,7 @@ if $ARGS[0] = 'boys':
 		'"I doubt they would be that crazy. Vitek would kill them both with his bare hands."'
 		'"Don''t forget that he also has connections with Vadim Bely."'
 		'"You shouldn''t talk about him. You remember the last guy that talked behind his back?"'
-		'"I remember... They never did find his legs did they? Umm, let''s talk about something else now..."'
+		'"They never did find his legs, did they? Umm, let''s talk about something else now..."'
 	elseif chat_rand = 35:
 		'"Dude, you''re not going to believe this. There''s this chick in my class that''s always letting me look down her shirt!"'
 		'"Man, you''re so full of shit!"'
@@ -708,7 +707,7 @@ if $ARGS[0] = 'boys':
 		'"Well, he said Pavlovsk is like living in a porn movie or video game. That Moscow is nothing like this."'
 		'The second boy laughs. "More like the girls there see through his bullshit and don''t give him play."'
 		'"Yeah, maybe, but I don''t know. The girls are just different there. I mean, normally it isn''t too hard to find a girl that will let you fuck her, but they''re a lot more resistant there."'
-		'"Well, what do you expect? It''s Moscow, they''re obsessed with being all prim and proper. Moscow is just boring, it''s not us that are different, but them."'
+		'"Well, what do you expect? It''s Moscow, they''re obsessed with being all prim and proper. It''s not us that are different, it''s them."'
 		'"Hmm yeah, you''re most likely right, but man it would be fun to live in a porn movie or video game though, wouldn''t it?"'
 		'"Fuck yeah it would!"'
 	elseif chat_rand = 39 and fame['pav_sex'] > 25:
@@ -771,31 +770,29 @@ if $ARGS[0] = 'boys':
 		'"I''m not talking about the game. I''m going there to watch Bella do her stuff. I know a good spot in the stands where you can get a nice view of that toned ass."'
 		'"Oh I''m definitely down to see that!"'
 	elseif chat_rand = 43:
+		'You overhear two boys speaking to each other.'
 		'"I heard Albina''s ass is fake and that her dad paid for implants."'
 		'The other boy laughs. "Oh believe me, it''s real. It''s too firm to be fake."'
-		'"How would you know how firm her ass is? She would rip your arm off and fist you with it if you tried to cop a feel."'
-		'"I''ve watched her enough in gym class and at cheerleading. It doesn''t jiggle like implants would. It''s solid, toned muscle."'
+		'"How would you know? She''d break your arm if you tried to cop a feel."'
+		'"I''ve watched her enough in gym class. Trust me, it''s solid, toned muscle."'
 	elseif chat_rand = 44:
-		'You overhear two scrawny boys speaking to each other.'
-		'"Word is that Albina loves anal and makes people eat her ass," the first one whispers.'
-		'The other boy grins slyly. "The things I would do to have a shot with her... Wouldn''t you love to put your junk in her trunk?"'
-		'The first boy looks in Albina''s direction, who notices him staring at her, causing him to quickly look back at his friend. "In my wildest fucking dreams!"' 
+		'You overhear two boys speaking to each other.'
+		'"The things I''d do to have a shot with Albina..." one says with a grin. "Wouldn''t you love to put your junk in her trunk?"'
+		'His friend looks in Albina''s direction. "Even just copping a feel of that ass would be heaven! How does Lazar do it?"' 
 	elseif chat_rand = 45:
-		'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
-		'"Come on, you know you want it!" you hear one of them say.'
-		'"I don''t know. Is it worth the risk?"'
-		'"An ass like that is always worth it! Just go flirt with her. She might surprise you."'
+		'As you walk down the hallway, you overhear a group of boys from another class whispering at each other.'
+		'"I don''t know, she''s kind of scary..." one of them says, looking rather nervous.'
+		'"You lost the bet, dude. Loser has to hit on her," his friend replies and pushes him towards Albina.'
 		*nl
-		'His friends push him towards her. "Uh, hey. Do you wear space pants to gym class... Because your ass is out of this world..." he asks with a crack in his voice, but still making a cringy attempt to act smooth by leaning against the locker and smiling.'
-		'Albina turns to face him. She''s unimpressed by his poor attempt at flirting, crossing her arms and just staring at him.'
-		'He quickly flees in a panic, his friends following close behind. You''ve never seen anyone run so fast in your life. Albina scoffs before turning back to what she was doing.'
+		'"Uh, hey... Do you wear space pants to gym class...? Because your ass is out of this world..." he asks with a crack in his voice, but still making a cringy attempt to act smooth by leaning against the locker.'
+		'Albina''s not impressed by his poor attempt at flirting and gives him a dirty look, causing the boy to quickly flee. You''ve never seen anyone run so fast in your life.'
 	else
 		gs 'gschool_gossip', 'boys', $ARGS[1]
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
 		*nl
-		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.'
+		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen; you smile, thinking about what that means.'
 	end
 end
 
@@ -808,7 +805,7 @@ if $ARGS[0] = 'girls':
 		*nl
 	end
 
-	chat_rand = rand(1, 43)
+	chat_rand = rand(1,43)
 	if chat_rand = 1:
 		'"I quit volleyball."'
 		'"Why?"'
@@ -816,7 +813,7 @@ if $ARGS[0] = 'girls':
 	elseif chat_rand = 2:
 		'"I''m going to stop getting into trouble. I got sent to the principal again yesterday and my butt''s still sore."'
 		'"It''s not that bad. I actually kind of like it."'
-		'"Wha... never mind, I don''t want to know. All I know is I''ve been there so much, she uses a paddle on me now."'
+		'"Wha... Never mind, I don''t want to know. All I know is I''ve been there so much, she uses a paddle on me now."'
 		'"Really?" she asks, sounding excited. "I mean that sounds terrible... What kind of paddle?"'
 	elseif chat_rand = 3:
 		'"I was almost raped in the park the other day by some guys trying to get me to drink with them."'
@@ -834,7 +831,7 @@ if $ARGS[0] = 'girls':
 	elseif chat_rand = 9:
 		'"If you have a secret, don''t tell Lizaveta about it. I told her about I gave my boyfriend a blowjob and before the day was over, everyone knew about it. What a bitch."'
 	elseif chat_rand = 10:
-		'"Ivan is such a hottie! It''s a shame he doesn''t want a girlfriend. I would totally be his girlfriend, but no matter who asks, he always tells them no."'
+		'"Ivan is such a hottie! It''s a shame he doesn''t want a girlfriend. I would totally be his girlfriend, but no matter who asks, he always says no."'
 		'"Maybe he''s gay?"'
 		'Her friend giggles. "No, he likes fucking girls, but just as friends."'
 	elseif chat_rand = 11:
@@ -846,9 +843,9 @@ if $ARGS[0] = 'girls':
 	elseif chat_rand = 12:
 		'"Did you hear what happened to Petka?"'
 		'"No, what?"'
-		'"Some of the boys grabbed him while he was in the shower and threw him out of the boys locker room naked, just as us girls were leaving. There he was, completely naked, before he covered himself up and ran back into the boys locker room."'
+		'"Some of the boys grabbed him while he was in the shower and threw him out of the boys locker room naked, just as us girls were leaving. There he was, completely naked before he covered himself up and ran back into the locker room."'
 		'"Poor guy, boys can be so mean."'
-		'"I know right? Oh and he has a really little dick." The girls start giggling.'
+		'"I know, right? Oh and he has a really little dick!"'
 	elseif chat_rand = 13:
 		'"Radomir is so good looking and is so talented. I wish he would ask me out."'
 		'"I don''t know about that. I heard after he fucks a girl a few times, he dumps her."'
@@ -914,9 +911,9 @@ if $ARGS[0] = 'girls':
 		'"Wow, I guess he does look at my butt."'
 	elseif chat_rand = 29:
 		'"You''ve been giggling since the break! What''s going on with you?"'
-		'"I accidentally walked into the boy''s bathroom." She starts giggling.'
+		'"I accidentally walked into the boy''s bathroom," her friend says before she starts giggling.'
 		'"So?"'
-		'"I ran into Igor while he was taking a piss." She giggles harder.'
+		'"I ran into Igor while he was taking a piss."'
 		'"And?"'
 		'The girl can''t speak. She just holds up her hands, keeping them very close together and has to fight the urge to break into laughter. It dawns on the other girl what she''s trying to tell her and she starts giggling too.'
 	elseif chat_rand = 30:
@@ -930,7 +927,7 @@ if $ARGS[0] = 'girls':
 		if fedorKozlovQW >= 20:
 			act 'Tell them off':
 				cla
-				'"What are you talking about? You know we''re dating, right?" you cut it on the conversation. "Trust me, he''s not. And you better not be talking shit about my boyfriend, especially behind his back."'
+				'You cut it on the conversation. "What are you talking about? You better not be talking shit about my boyfriend, especially behind his back!"'
 				act 'Continue': gt $menu_loc, $menu_arg
 			end
 		end
@@ -960,17 +957,14 @@ if $ARGS[0] = 'girls':
 		end
 	elseif chat_rand = 34:
 		if natbelQW['FriendLover'] < 7 and natbelQW['QWstage'] <= 2:
-			'"Natasha asked where I bought my top and I had to stop myself from laughing in her face."'
+			'"Natasha asked me where I bought my top earlier and I had to stop myself from laughing in her face."'
 			'"Why?"'
-			'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
+			'"Because she could never afford it! Why would she even bother asking? Does she not realize her mom is dirt poor?"'
 		else
-			'"Natasha asked me where I bought my top and I had to stop myself from laughing in her face."'
-			'Why?"'
-			'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
-			'"Well I''m not so sure that''s still the case as she''s got some new clothes recently including a nice new uniform."'
-			'"Yeah I''ve seen but her family are definitely poor. She''s been hanging around a lot with <<$pcs_nickname>>. I dunno but maybe <<$pcs_nickname>> is buying the stuff for her?"'
-			'"Don''t ask me I wouldn''t know; I guess maybe. I wonder if they''re more than friends?"'
-			'"Well if you find out let me know."'
+			'"Where did Natasha get that new uniform? Isn''t her mom dirt poor?"'
+			'"She''s been hanging around a lot with <<$pcs_nickname>> recently. Maybe she''s buying stuff for her?"'
+			'"I guess so. I wonder if they''re more than friends?"'
+			'"If you find out, then let me know."'
 		end
 	elseif chat_rand = 35:
 		'"I left my sweater in my locker yesterday, you know the one. Anyway, I came back to school to get it and I saw Anushka running down the hall stark naked."'
@@ -988,8 +982,8 @@ if $ARGS[0] = 'girls':
 		'"Shut up and speak for yourself!" the second one replies.'
 		'"Hey, I admit I think about it all the time too, but I heard it''s because Baba Yaga cursed the area long ago," the third girl replies.'
 		'"Really? How so?" the first girl asks.'
-		'"Well, supposedly way back, some villagers in the area had some young couple distract Baba Yaga by pretending like they were about to have an orgy. Meanwhile, others snuck into her hut and stole a bunch of her food. When Baba Yaga realized what they had done, she cursed everyone, all their descendants and all who would ever live here to forever lust for one another."'
-		'The second girl finally says something. "That''s crazy!" She only sounds half convinced though.'
+		'"Well, supposedly way back, some villagers in the area had some young couple distract Baba Yaga by pretending they were about to have an orgy. Meanwhile, others snuck into her hut and stole a bunch of her food. When Baba Yaga realized what they''d done, she cursed everyone, all their descendants and all who would ever live here to forever lust for one another."'
+		'"That''s crazy!" the second girl says, but she only sounds half convinced.'
 		'"Or that means it''s not our fault how we feel," the first girl replies and they all go quiet as they think about it, likely liking the idea it''s someone else''s fault for their lusty thoughts.'
 	elseif chat_rand = 38:
 		'"Sooo, I''ve got a secret to tell you, but make sure not to spread it to anyone else," one girl whispers to another. "You know I''ve been obsessed with Ivan lately..."'
@@ -1007,14 +1001,13 @@ if $ARGS[0] = 'girls':
 		'"I might work out more. I want a big butt just like Albina''s!"'
 		'"Girl please. Her ass is as fake as her ''sweet girl'' personality."'
 		'"I dare you to say that to her face!"'
-		'The girl turns silent. "Yeah, that''s what I thought..." the first one quips.'
+		*nl
+		'The girl turns silent.'
+		'"Yeah, that''s what I thought..." the first one quips.'
 	elseif chat_rand = 42:
-		'Albina walks past a group of girls who check her out. Once she''s out of earshot, they all start speaking.'
-		'"I wonder how much those butt implants cost!"'
+		'"I wonder how much Albina''s butt implants cost?"'
 		'"Bitch, you''re just jealous because you have such a flat ass!"'
-		'"It just looks so big and firm!"'
-		'"I''m too scared to ask her what workout she does to get such a nice bum!"'
-		'You leave the girls to wallow in their envy of Albina.'
+		'"I''m too scared to ask her what workout she does to get such a nice butt!"'
 	elseif chat_rand = 43:
 		'You overhear some girls whispering amongst themselves.'
 		'"I was told that Albina is a lesbian, which is why she doesn''t like guys hitting on her," one says.'
@@ -1026,7 +1019,7 @@ if $ARGS[0] = 'girls':
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
 		*nl
-		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.'
+		'You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen; you smile, thinking about what that means.'
 	end
 end
 
@@ -1074,7 +1067,7 @@ if $ARGS[0] = 'Lizaveta':
 	elseif chat_rand = 17:
 		'"I heard Marcus tries to lure girls to the city, where he takes them to the university dorms and all the blacks gang bang her."'
 	elseif chat_rand = 18:
-		'"Did you hear what happened to Petka? Some of the boys grabbed him while he was in the shower and threw him out of the boys locker room naked, just as us girls were leaving. There he was, completely naked, before he covered himself up and ran back into the boys locker room."'
+		'"Did you hear what happened to Petka? Some of the boys grabbed him while he was in the shower and threw him out of the boys locker room naked, just as us girls were leaving. There he was, completely naked before he covered himself up and ran back into the locker room."'
 	elseif chat_rand = 19:
 		'"I wish Anushka would wear a towel or something in the locker room! I''m tired of her constantly walking around naked."'
 	elseif chat_rand = 20:
@@ -1088,10 +1081,9 @@ if $ARGS[0] = 'Lizaveta':
 	elseif chat_rand = 24 and fedorKozlovQW <= -10:
 		'"I heard, now that Fedor sucked Vasily''s dick, that he is now gay and loves it."'
 	elseif chat_rand = 25:
-		'"I was in the city last week and I saw Ms. Braakman at a club partying like crazy."'
-		'"I hear she''s a total party animal that goes to the city on Friday night and doesn''t come home until Sunday night and parties the whole time."'
+		'"I was in the city last week and saw Ms. Braakman at a club partying like crazy! I hear she''s a total party animal who goes to the city on Friday night and doesn''t come home until Sunday afternoon."'
 	elseif chat_rand = 26:
-		'"I heard when Ms. Braakman''s husband was still alive they were swingers, now she just goes to orgies."'
+		'"I heard Ms. Braakman and her husband were swingers. Now she just goes to orgies."'
 	elseif chat_rand = 27:
 		'"I heard Ms. Braakman killed her husband and made it look like an accident."'
 	elseif chat_rand = 28:
@@ -1101,9 +1093,9 @@ if $ARGS[0] = 'Lizaveta':
 	elseif chat_rand = 30:
 		'"I heard the janitor drilled a hole in the wall of the girls shower in the gym and spies on them when they take a shower."'
 	elseif chat_rand = 31:
-		'"Oh man, did you hear what happened to Igor? He got his shorts pulled down in the middle of gym class and just had a tiny dick that wasn''t much bigger than a girls clit."'
+		'"Did you hear what happened to Igor? He got his shorts pulled down in the middle of gym class. He has a tiny dick that isn''t much bigger than a girl''s clit!"'
 	elseif chat_rand = 32:
-		'"Lazar has a huge dick. Biggest one I have ever seen, even bigger than the guys in pornos. I''ve seen it when a bunch of us went skinny dipping last summer."'
+		'"Lazar has a huge dick. Biggest one I''ve ever seen, even bigger than the guys in pornos. I seen it when a bunch of us went skinny dipping last summer."'
 	elseif chat_rand = 33:
 		'"Irina can be such a bitch. I asked her for some beauty tips and she told me nothing I do will make me look as good as her."'
 	elseif chat_rand = 34:
@@ -1128,34 +1120,34 @@ if $ARGS[0] = 'Lizaveta':
 		if natbelQW['FriendLover'] < 7:
 			'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
 		else
-			'"Natasha''s mom must be super poor. Until recently she was wearing the same school uniform she had last year but now I see she''s wearing some nice clothes and a nice new uniform too."'
-			'After a brief pause she continues. "Erm... I''ve noticed she''s been hanging around with you recently and I''m not sure but think I saw you two walking holding hands in the park a while back." She looks at you seeking confirmation.'
-			'Knowing her reputation for gossip you keep your response simple. "Yeah well she''s helping me with school work so I''ve helped her by getting her some new clothing. Just being friendly..." You trail off'
-			'Deciding to end this conversation before it become too awkward you make your excuses and leave.'
+			'"Natasha''s mom must be super poor. She was wearing the same school uniform she had last year, but now I see she''s wearing a nice new one."'
+			'After a brief pause, she continues. "I''ve noticed she''s been hanging out a lot with you recently too. I actually think I saw you two holding hands in the park as well."'
+			'Knowing her reputation for gossip, you keep your response simple. "Yeah, she''s helping me with schoolwork, so I got her some new clothes as thanks. Just being friendly..."'
+			'Deciding to end this conversation before it become too awkward, you make your excuses and leave.'
 		end
 	elseif chat_rand = 44:
 		if natbelQW['FriendLover'] < 7:
-			'"Whatever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
+			'"Whatever you do, don''t loan money to Natasha. She''ll never pay you back. I lent her 50<b>₽</b> and I doubt I''ll ever see it again."'
 		else
-			'"Natasha recently repaid the money she owed me. I began to thing she''d never repay me!"'
-			'After a brief pause she continues "I know she''s been hanging out with you recently and I think I saw you two walking holding hands in the park a while back."'
-			'Knowing her reputation for gossip you keep your response simple. "Yeah well she''s helping me with school work so I''ve helped her out as she was getting stressed about owing people. Just being friendly..." You trail off'
-			'Deciding to end this conversation before it become too awkward you make your excuses and leave.'
+			'"Natasha actually repaid me! I was starting to think she never would!"'
+			'After a brief pause, she continues. "I know she''s been hanging out a lot with you recently. I actually think I saw you two holding hands in the park as well."'
+			'Knowing her reputation for gossip, you keep your response simple. "Yeah, she''s helping me with schoolwork, so I helped her out since she was getting stressed about owing people. Just being friendly..."'
+			'Deciding to end this conversation before it become too awkward, you make your excuses and leave.'
 		end
 	elseif chat_rand = 45:
 		'"Radomir acts like he''s already the next Yuri Shatunov. I mean, he''s okay, but he''s nowhere near as good as he likes to think he is."'
 	elseif chat_rand = 46:
 		'"Lera is a lesbian. All you have to do is watch how she looks at Lena or other girls in the locker room."'
 	elseif chat_rand = 47:
-		'"I''ve heard so many things about Albina''s ass that I don''t know what to tell people! She also likes anal, I mean <i>really</i> likes anal."'
+		'"I''ve heard so many things about Albina''s ass that I don''t know what to tell people!"'
 	elseif chat_rand = 48:
-		'"I think Albina is a lesbian. Why else would she hate all the hot guys hitting on her?"'
+		'"I think Albina''s a lesbian. Why else would she hate all the hot guys hitting on her?"'
 	else
 		gs 'gschool_gossip', 'Lizaveta', $ARGS[1]
 	end
 end
 
-!!I am adding this as a event that should happen each monday this number goes up, it should only trigger once ever at each stage and then never again. soniafall is set in soniadisco file
+!!I''m adding this as an event that should happen each Monday when this number goes up. It should only trigger once at each stage and then never again. (soniafall is set in soniadisco file)
 if $ARGS[0] = 'sonia_disco_gossip':
 	if soniafall = 1:
 		'"You should have seen Sonia at the disco."'
@@ -1166,7 +1158,7 @@ if $ARGS[0] = 'sonia_disco_gossip':
 		'"Sonia was at it again at the disco."'
 		'"What? Again? When?"'
 		'"Right after you left. She kept getting drinks from the gopniks all night again and when she was on the dance floor, she was grinding on anyone and everyone that wanted to dance with her. She got totally wasted again! Of course, one of the girls screwed it all up again and took her home."'
-		'"Damn! I can''t believe I missed that... again."'
+		'"Damn! I can''t believe I missed that... Again."'
 	elseif soniafall = 3:
 		'"Sonia went off with some of the gopniks and came back totally wasted with one of her tits hanging out."'
 		'"Are you kidding me?!"'
@@ -1174,26 +1166,26 @@ if $ARGS[0] = 'sonia_disco_gossip':
 		'"Why does all of this keep happening when I''m not there?!"'
 	elseif soniafall = 4:
 		'"Sonia went off with some of the gopniks at the disco and got totally wasted with them. She took off her top and flashed them all her tits."'
-		'"No way, how you would you know?"'
+		'"No way! How do you know?"'
 		'"It''s true! Pauline took a video of her and I seen it."'
-		'"Shit, I need to go ask Pauline for a copy..."'
+		'"Shit, I need to ask Pauline for a copy..."'
 	elseif soniafall = 5:
-		'"Sonia went off with some of the gopniks at the disco and got totally wasted with them. She took off her panties and flashed them all her pussy."'
-		'"Fuck, are you serious?! I honestly can''t believe Sonia would go that far. I know she''s been acting slutty lately, but damn."'
-		'"Yeah no shit, I always thought she was one of those good girls like Katja, but now she''s worse than Vicky."'
+		'"Sonia went off with some of the gopniks at the disco and got totally wasted with them. She took off her panties and flashed her pussy at them."'
+		'"Fuck, are you serious?! I honestly can''t believe Sonia would go that far! I know she''s been acting slutty lately, but damn..."'
+		'"Yeah, no shit. I always thought she was one of those good girls like Katja, but now she''s worse than Vicky."'
 		'"Did Pauline record it again?"'
 		'"Yeah, she has a nice pussy."'
 		'"Fuck, how do you always find out about this first? I need to see that video."'
 	elseif soniafall = 6:
 		'"Sonia went off with some of the gopniks at the disco and got totally wasted with them. She gave Vitek a blowjob!"'
-		'"Lucky bastard, I guess she really is turning into a slut."'
-		'"Totally. It''s a shame she was such a nice girl." He looks at his friend and sighs. "Yes, Pauline recorded it."'
-		'"I didn''t... Well if everyone has seen it, I should as well I guess."'
+		'"Lucky bastard. I guess she really is turning into a slut."'
+		'"Totally. It''s a shame since she was such a nice girl." He looks at his friend and sighs. "Yes, Pauline recorded it."'
+		'"I didn''t... Well if everyone has seen it, then I should too I guess..."'
 	elseif soniafall = 7:
 		'You see Sonia walking down the hall ahead of you with her head down. Some people are laughing, many are jeering at her, and more than a few are calling her a slut. When they''re not doing that, they''re on their phones watching something. You get a ping on your phone and stop to pull it out.' 
 		'It''s a message from Pauline with a video attached. You open the video, and to your shock, see Sonia getting gangbanged by a group of gopniks. When they all finish on her face, they drag her back to the disco, where she is paraded around like a prize as cum drips off her face. She eventually realizes what''s going on and flees as everyone laughs at her.'
 		*nl
-		'You know her reputation is in tatters now. One drunk mistake and her life as she knew it is over. The cool kids will dump her after this and no one will take her in. She''ll be an outcasted slut from now on. The only people that will talk to her now are boys trying to use her sexually now. You sigh and put your phone away.'
+		'You know her reputation is in tatters now. One drunk mistake and her life as she knew it is over. The cool kids will dump her after this and no one will take her in. The only people that will talk to her now are boys wanting to use her for sex. You sigh and put your phone away.'
 	end
 	soniafall['gossip'] = soniafall
 end
@@ -1207,18 +1199,18 @@ if $ARGS[0] = 'gosip':
 			end
 			*nl
 			'"Did you hear what happened at the disco the other night? Sonia gave like five guys a blowjob, all at once!"'
-			'"I heard it. I don''t think anyone would want to go out with her anymore now, not after Kotov and his cronies had their way with her."'
+			'"I heard. I don''t think anyone will go out with her now, not after Kotov and his cronies had their way with her."'
 			'"What do you mean?"'
 			'"They all came right on her face, and made her walk out like that. I bet half the town has seen pictures of her face covered in cum. It''s disgusting!"'
 		elseif soniaPS = 2:
 			*nl
-			'"Have you heard what Sonia is up to nowadays? Apparently she''s giving out blowjobs to anyone interested in the bathrooms, during breaks!"'
-			'"Whoa, that''s nasty! Do you think we should go have a look today?"'
+			'"Have you heard what Sonia is up to nowadays? Apparently, she''s giving out blowjobs in the bathroom during breaks!"'
+			'"That''s nasty! Should we go have a look?"'
 		elseif soniaPS = 3:
 			*nl
 			'"Sonia turned into a huge whore all of a sudden. She has all sorts of sex now, no matter how nasty! Such a shame."'
-			'"What do you mean, such a shame? Why do you even care?"'
-			'"Oh it''s nothing. I used to like her a lot, but back in the ninth grade she was such a prude, she wouldn''t even go on a date with me!"'
+			'"What do you mean, ''such a shame''? Why do you even care?"'
+			'"Oh it''s nothing. I used to like her a lot, but she was such a prude back then that she wouldn''t even go on a date with me!"'
 		end
 	else
 		if fame['pav_sex'] < 50:
@@ -1285,13 +1277,13 @@ if $ARGS[0] = 'sveta_dyke_rumors':
 	elseif sveta_dyke_rumor = 18:
 		'Two boys are chatting in the hallway as you walk past. "Did you hear about <<$pcs_nickname>>?" one of them asks.'
 		'"What? That she''s a dyke? Everyone knows that!" his friend replies while glancing at you.'
-		'"No. Well, sort of. She was caught jilling off while checking out the other girls when they were naked," the first one replies.'
-		'"Fuck, she''s a bigger dyke than Lera, but damn that''s hot... and disgusting. Fucking dykes."' 
+		'"No. Well, sort of. She was caught rubbing one out at the other girls when they were showering," the first one replies.'
+		'"Fuck, she''s a bigger dyke than Lera!"' 
 		'Eventually, you walk far enough way to no longer be able to hear them as you head on your way.'
 	elseif sveta_dyke_rumor = 12:
-		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>> is such a dyke. She just won''t stop checking the other girls out in the shower."'
+		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>> is such a dyke. She just won''t stop checking out the other girls in the locker room."'
 		'"I heard she was pretty much drooling while checking out Bella..." his friend replies while glancing at you.'
-		'The first one laughs as he replies. "Well I can hardly blame her for that."'
+		'The first one laughs. "Well I can hardly blame her for that."'
 		'Eventually, you walk far enough way to no longer be able to hear them as you head on your way.'
 	elseif sveta_dyke_rumor = 6:
 		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>>''s been at it again. She was caught checking out several of the other girls."'
@@ -1300,8 +1292,8 @@ if $ARGS[0] = 'sveta_dyke_rumors':
 	else
 		'Two boys are chatting in the hallway as you walk past. "Did you hear about <<$pcs_nickname>>?" one of them asks the other as you walk past.'
 		'"What about her?" his friend replies while glancing at you.'
-		'"I heard she was checking the other girls out in the girls locker room after gym class."'
-		'"Damn, think she''s a lesbian?"'
+		'"I heard she was caught checking out the other girls in the locker room after gym class."'
+		'"Damn. Think she''s a lesbian?"'
 		'Eventually, you walk far enough away to no longer hear them as you head on your way.'
 	end
 	sveta_dyke_rumor +=1

+ 67 - 59
locations/gschool_lessonsev1.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'fiz_rand':
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand2.jpg"></center>'
-		'During the warm-up for your gym class, Mr. Pavlovich comes over to assist you with your warm-up, his groin grinding against your ass as he does. If looks could kill, Christina''s jealous gaze would have had you dead on the ground by now.'
+		'During the warm-up for gym class, Coach Pavlovich comes over to assist you with your warm-up, his groin grinding against your ass as he does. If looks could kill, Christina''s jealous gaze would have had you dead on the ground by now.'
 	elseif fizperand = 2:
 		*clr & cla
 		pcs_mood += 20
@@ -24,7 +24,7 @@ if $ARGS[0] = 'fiz_rand':
 				gs 'arousal', 'foreplay', 10, 'exhibitionism'
 				pcs_mood += 20
 				gs 'stat'
-				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Mr. Pavlovich is keeping his distance, unsure what to think or do.'
+				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
 			end
 		else
 			act 'Pull your pants down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -99,7 +99,7 @@ if $ARGS[0] = 'fiz_rand':
 					grupvalue[4] +=1
 					demerit += 20
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
-					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him in the face.'
+					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him.'
 					'He tries to block your incoming blows to no avail. Luckily for him, the coach arrives, grabs you by the back of the neck and effortlessly pulls you off of him, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, <b>NOW</b>!"' 
 					'You try to protest, but he doesn''t want to hear it and points sternly at the door, so you begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
 					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
@@ -126,11 +126,11 @@ if $ARGS[0] = 'fiz_rand':
 			'When you don''t object, his hands slide under your shirt and squeeze your breasts. He then pulls your shirt over your head before you can even protest.'
 			gs 'arousal', 'foreplay', 2, 'sub'
 			act 'Say nothing': gt 'gschool_sex', 'storagesex'
-			act 'Tell him no':
+			act 'Pull away':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
-				'You jerk away from him and snatch your shirt out of his hand. "Mr Pavlovich, I''m not that kind of girl."'
-				'He laughs. "That''s not what I hear."'
+				'You jerk away from him and snatch your shirt out of his hand. "Mr. Pavlovich, I''m not that kind of girl!"'
+				'He laughs. "That''s not what I hear..."'
 				'You give him a dirty look and put your shirt back on before storming out.'
 				gs 'arousal', 'end'
 				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
@@ -206,29 +206,30 @@ if $ARGS[0] = 'biology':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that before class?" in an embarrassed and scandalized tone. "<i>Both holes?</i>"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that before class?" she murmurs to herself in an embarrassed, almost scandalized tone. "<i>Both holes</i>?"'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that <i>before class?</i>" she mmurmurs to herself in an embarrassed tone. "Just how sexually active are you?"'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that <i>before class?</i>" she murmurs to herself in an embarrassed tone. "Just how sexually active are you?"'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'fame', 'pav', 'sex', rand(8,12)
 				pcs_memory['school_no_panty_anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard. While solving it, you accidentally drop the cloth and totally forget that not only are you are not wearing any panties, but also have a butt plug stuffed in your ass. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your classmates.'
+				'You''ve been called up to answer the question written on the blackboard. While solving it, you accidentally drop the cloth used to clean the board and totally forget that not only are you are not wearing any panties, but also have a butt plug stuffed in your ass. When you bend over, you feel your skirt rise up, exposing your bare pussy and ass to your classmates.'
 				'Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Miss Orlov sits, she can''t see what everyone is fussing over, so she starts to move to get a better look, but you quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				pcs_memory['school_no_panty_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov swiftly steps behind you, blocking the view of your ass as best she can, and softly whispers, "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
+				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov swiftly steps behind you, blocking the view of your ass as best she can.'
+				'"This is why you should wear panties to school," she softly whispers. "I won''t report you, but I suggest you wear some in the future."'
 			else
 				gs 'fame', 'pav', 'sex', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
@@ -238,7 +239,7 @@ if $ARGS[0] = 'biology':
 			cla
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
 			'During class, you feel a hand slide around your side and grab one of your breasts. You squeak loudly and try to smack Dan''s hand away, but he jerks it away and all you manage to do is smack your breast.'
-			'"Is there a problem, Miss <<$pcs_lastname>>?" you hear Miss Orlov ask as you glance around and notice everyone staring at you as Dan snickers behind you. Miss Orlov looks at you curiously.'
+			'"Is there a problem, Miss <<$pcs_lastname>>?" Miss Orlov asks as you glance around and notice everyone staring at you as Dan snickers behind you. Miss Orlov looks at you curiously.'
 			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Tell on him (<<will_cost>> Willpower)':
@@ -323,7 +324,8 @@ if $ARGS[0] = 'biology':
 								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
+								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris.'
+								'However, your bare pussy is just too tempting to resist and you soon abandon the pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
 								$orgasm_txt = 'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan 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 Dan''s hand slide away as you notice Miss Orlov giving you a questioning look. With bright eyes and a confident smile, you quickly fix your clothes and sit up in your seat.'
 								$orgasm_or = 'yes'
@@ -395,14 +397,14 @@ if $ARGS[0] = 'biology':
 			gs 'stat'
 		elseif scooltiperand = 7:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
-			'There''s a loud crash from the back of the room and you and the rest of the class all turn to see Lavrenti is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
+			'There''s a loud crash from the back of the room and you, along with the rest of the class, turn to see Lavrenti is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
 			'Lavrenti quickly wiggles himself out, gets the desk upright again and hurriedly sits down again, blushing furiously all the while. After making sure he''s okay, Miss Orlov gets the class back under control and finishes the lesson.'
 		elseif scooltiperand = 8:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
-			'Glancing around the class, you notice Lavrenti reaching around the girl sitting in front of him and grabbing her breast. At first, she tries to fend him off and tell him to stop, but after Miss Orlov shoots her a few dirty looks for the noise she''s making, she just gives up and tries to ignore his groping hands.'
+			'Glancing around the class, you notice Lavrenti reaching around the girl sitting in front of him and grabbing her breast. At first, she tries to fend him off and tell him to stop, but after Miss Orlov shoots a few looks at her, she just gives up and tries to ignore his groping hands.'
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
-			'You get an alert on your phone. Seeing that Miss Orlov is busy, you sneakily pull it out of your purse, rest it in your lap and lean back before glancing down to see that someone has sent you an image. You open it up, expecting something innocent, only to be confronted by a photo of someone''s dick. You hear snickering from one side and look up to investigate, but you can''t tell who it was or exactly where it came from. Unsure what to do about it, you decide that you don''t want to be caught looking at it, so you delete the image.'
+			'You get an alert on your phone. Seeing that Miss Orlov is busy, you sneakily pull it out of your purse, rest it in your lap and lean back before glancing down to see that someone has sent you an image. You open it up, expecting something innocent, only to be confronted by a photo of someone''s dick. You hear snickering from one side and look up to investigate, but you can''t tell who it was or exactly where it came from. Unsure what to do and not wanting to be caught looking at it, you quickly delete the image.'
 			gs 'arousal', 'erotic', 2, 'unknown'
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flick.jpg"></center>'
@@ -413,26 +415,26 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 12:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/danshowdick.jpg"></center>'
 			'Near the end of class, Miss Orlov assigns your homework and gives you the last few minutes of time to work on it. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few minutes, you hear someone giggle and glance up and look around; you quickly notice that Dan has his pants unzipped and his dick is hanging out as he says something to Irina, who is mostly ignoring him, although she does take a peek now and again, as does Natasha.'
-			'Whatever he wanted isn''t going to happen and he finally puts his dick away at the end of class.'
+			'Whatever he wanted isn''t going to happen though, and he finally puts his dick away at the end of class.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/irinaselfie.jpg"></center>'
-			'Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the class. Of course, once she''s gone, everyone starts talking and only a few of the nerds actually study. Irina gets up and sits on the edge of Miss Orlov''s desk and starts taking selfies. She ignores the boys hoots and cat calls until the end of class when the bell rings.'
+			'Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the room. Of course, once she''s gone, everyone starts talking and only a few of the nerds actually study. Irina gets up and sits on the edge of Miss Orlov''s desk and starts taking selfies. She ignores the boys hoots and cat calls until the end of class when the bell rings.'
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natpanties.jpg"></center>'
-			'Near the end of class, Miss Orlov assigns your homework and gives you the last bit of classtime to work on it. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few minutes, you glance around and notice Natasha is sitting with her legs slightly apart, showing off her panties to anyone that looks. You doubt she''s aware of it since she seems completely engrossed in working on her homework.'
+			'Near the end of class, Miss Orlov assigns your homework and gives you the last bit of time to work on it. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few minutes, you glance around and notice Natasha is sitting with her legs slightly apart, showing off her panties to anyone that looks. You doubt she''s aware of it since she seems completely engrossed in working on her homework.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif scooltiperand = 15:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natsit.jpg"></center>'
-			'Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the class. Of course, once she''s gone, everyone starts talking and only a few of the nerds actually study. Most of the students get up and walk around. Even Natasha puts her books away, gets up and sits on the back of her chair, giving you a smile when you look her way.'
+			'Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the room. Of course, once she''s gone, everyone starts talking and only a few of the nerds actually study. Most of the students get up and walk around. Even Natasha puts her books away, gets up and sits on the back of her chair, giving you a smile when you look her way.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 16:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natskirt.jpg"></center>'
-			'Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty-clad ass as she sits through the rest of the class. Several other students notice as well.'
+			'Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done, Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty-clad ass as she sits through the rest of the class. Several other students notice as well.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -578,7 +580,7 @@ if $ARGS[0] = 'biology':
 						npc_rel['A149'] += 1
 						'You sit next to Lazar and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
-						'You sit next to Lazar. He ignores you, only talking to you if it involves mocking you.'
+						'You sit next to Lazar, but he ignores you and only talks to you if it involves mocking you.'
 					else
 						npc_rel['A149'] += 1
 						'You sit next to Lazar. He''s a little surprised that you chose to do so, but seems to enjoy the attention you''re giving him. You''re able to strike up a brief conversation with him before Miss Orlov asks you to be quiet.'
@@ -642,17 +644,17 @@ if $ARGS[0] = 'science':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Miss Orlov poses, you have to clean the blackboard ,but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that before class?" in an embarrassed and scandalized tone. "<i>Both holes?</i>"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that before class?" she murmurs to herself in an embarrassed, almost scandalized tone. "<i>Both holes?</i>"'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that <i>before class?</i>" she murmurs to herself in an embarrassed tone. "Just how sexually active are you?"'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. Miss Orlov swiftly steps behind you, blocking the view and murmuring almost to herself, "You did that <i>before class?</i>" in an embarrassed tone. "Just how sexually active are you?"'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. Miss Orlov swiftly steps behind you, blocking the view. "You did that <i>before class?</i>" she murmurs to herself in an embarrassed tone. "Just how sexually active are you?"'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5
@@ -668,7 +670,8 @@ if $ARGS[0] = 'science':
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				pcs_memory['school_no_panty_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass as best she can. Once you are back on your feet she softly says "This is why you should wear panties to school. I won''t report you, but I suggest you wear some in the future."'
+				'Before you can answer the question Miss Orlov poses you, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass as best she can.'
+				'"This is why you should wear panties to school," she says softly once you''re back on your feet. "I won''t report you, but I suggest you wear some in the future."'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -682,7 +685,7 @@ if $ARGS[0] = 'science':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_10.jpg"></center>'
-			'As you wait for the end of the class, you notice a girl taking her shoes off and putting them back on, probably trying to get a bit more comfortable in them. She''s showing off her shapely legs as she does, drawing more than a few looks from her fellow classmates.'
+			'As you wait for the end of the class, you notice Irina taking her shoes off and putting them back on, probably trying to get a bit more comfortable in them. She''s showing off her shapely legs as she does, drawing more than a few looks from her fellow classmates.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
@@ -859,7 +862,8 @@ if $ARGS[0] = 'science':
 		elseif scooltiperand = 11:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/science/andstaskirt.jpg"></center>'
-			'As you sit in class listening to the lesson, you hear Stasya telling Andrey to stop. When you glance over, you see Andrey trying to pull her skirt up as she holds it down. She''s talking softly and trying not to draw attention, but after a few more hissed whispers, he lets go and says something along the lines of "You don''t have to be such a prude all the time." Stasya glares at him and class goes back to normal.'
+			'As you sit in class listening to the lesson, you hear Stasya telling Andrey to stop. When you glance over, you see Andrey trying to pull her skirt up as she holds it down.'
+			'She''s talking softly and trying not to draw attention, but after a few more hissed whispers, he lets go and mutters something as Stasya glares at him before the class goes back to normal.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 12:
 			gs 'stat'
@@ -870,12 +874,15 @@ if $ARGS[0] = 'science':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/science/iristagossip.jpg"></center>'
 			'As you sit in class listening to the lesson, you hear Irina and Stasya gossiping and overhear a bit of it.'
-			'"Did you hear that Igor got pantsed at the dance last Friday? He had the tiniest dick!" Stasya says as she holds up her hands to show how small it was. Irina giggles and they get a few looks, so they talk even quieter and you can''t make out what they''re saying anymore.'
+			'"Did you hear that Igor got pantsed at the dance last Friday? He had the tiniest dick!" Stasya says as she holds up her hands to show how small it was.'
+			'Irina giggles and they get a few looks, so they talk even quieter and you can''t make out what they''re saying anymore.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 14:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/science/stabraflash.jpg"></center>'
-			'As you sit in class listening to the lesson, you hear Andrey trying to get Stasya to do something. "Come on babe, just really quick." Stasya rolls her eyes, then looks around to make sure no one is watching before she pulls up her shirt to flash her boyfriend her bra. Andrey grins at her and tells her how great she is and they start to get all lovey dovey together.'
+			'As you sit in class listening to the lesson, you hear Andrey trying to get Stasya to do something. "Come on, babe! Just do it quickly!"'
+			'Stasya rolls her eyes, then looks around to make sure no one is watching before she pulls up her shirt to flash her bra at him.'
+			'Andrey grins at her and tells her how great she is and they start to get all lovey dovey together.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -883,7 +890,8 @@ if $ARGS[0] = 'science':
 		elseif scooltiperand = 15:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/science/staoverdesk.jpg"></center>'
-			'As class ends, Stasya starts to get up and knocks her book off the front of her desk. While still in her desk, she stands up and bends over to grab the book off the floor, inadvertently giving everyone behind her a look at her panty-clad ass until she straightens up. A few snickers and giggles causes her to look back as she seems to understand what happened. She quickly smooths out her skirt and leaves class with Andrey.'
+			'As class ends, Stasya starts to get up, but accidentally knocks her book off the front of her desk. While still in her desk, she stands up and bends over to grab it off the floor, inadvertently giving everyone behind her a look at her panty-clad ass until she straightens up.'
+			'A few snickers and giggles causes her to look back and she seems to understand what happened, quickly smoothing out her skirt before leaving with Andrey.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1016,7 +1024,7 @@ if $ARGS[0] = 'computer':
 								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
+								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it under your skirt and start prodding and playing with your already exposed clitoris, but your bare pussy is just too tempting to resist and you soon abandon the pencil in favor of your two middle fingers, quickly shoving them inside yourself. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
 								$orgasm_txt = 'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much and your knees fly together, trapping your hand as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves of pleasure and you feel Vasily''s hand slide away as you notice Mr. Ivanov giving you a questioning look. With bright eyes and a confident smile, you quickly fix your clothes and sit up in your seat.'
 								$orgasm_or = 'yes'
@@ -1081,7 +1089,7 @@ if $ARGS[0] = 'computer':
 			end
 		elseif scooltiperand = 5:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
-			'There''s a loud crash from the back of the room and you and the rest of the class all turn around to see that Vasily is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
+			'There''s a loud crash from the back of the room and you, along with the rest of the class, turn to see that Vasily is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
 			'Vasily quickly wiggles himself out, gets the desk upright again and hurriedly sits down again, blushing furiously all the while. After making sure he''s okay, Mr. Ivanov sends him to the principal''s office for disrupting class.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 6:
@@ -1091,7 +1099,8 @@ if $ARGS[0] = 'computer':
 		elseif scooltiperand = 7:
 			if soniaPS = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/classflash.mp4"></video></center>'
-				'Mr. Ivanov engages the class in conversation. Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at him, which he does his best to ignore, but you notice that his crotch is developing a serious bulge. Sonia notices too and pulls her shirt open, flashing her breasts at him and the rest of the class. He quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk, though his eyes linger on a smiling Sonia. You wonder why she isn''t sent to the principal''s office. If anyone else had done that, they would been kicked out of class.'
+				'Mr. Ivanov engages the class in conversation when Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at him. He does his best to ignore them, but you notice that his crotch is developing a serious bulge. Sonia notices too and pulls her shirt open, flashing her breasts at him and the rest of the class.'
+				'He quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk, though his eyes linger on a smiling Sonia. You wonder why she wasn''t sent to the principal''s office. If anyone else had done that, they would have been kicked out of class immediately.'
 				gs 'arousal', 'voyeur', 5
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1129,7 +1138,7 @@ if $ARGS[0] = 'computer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Vasily. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+					'You sit next to Vasily, who gives you a perverted smile and keeps asking if you want to suck his dick.'
 				elseif grupTipe = 4 or grupTipe = 5:
 					if grupTipe = 4:
 						npc_rel['A11'] += 1
@@ -1149,7 +1158,7 @@ if $ARGS[0] = 'computer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Albina, who immediately looks you over before shaking her head in disgust. "Don''t even think about it, cum rag".'
+					'You sit next to Albina, who immediately looks you over before shaking her head in disgust. "Don''t even think about it, cum rag."'
 				else
 					if grupTipe = 1 or grupTipe = 2 or AlbinaQW['Friends'] = 2:
 						npc_rel['A23'] += 1
@@ -1267,7 +1276,7 @@ if $ARGS[0] = 'computer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Katja, who stares at you in disbelief and starts blushing before she gets up and hurries to sit next to her sister.'
+					'You sit next to Katja, who stares at you in disbelief and starts blushing before she gets up and hurries to sit next to someone else.'
 				else
 					if grupTipe = 1:
 						npc_rel['A14'] += 1
@@ -1391,7 +1400,7 @@ if $ARGS[0] = 'computer':
 					npc_rel['A129'] -= 1
 					'<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. Ivanov looks at you, he''s staring 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.'
+					'"What''s 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 tell him.'
 					'He''s slightly nervous now and tries to compose himself. "Miss <<$pcs_lastname>>, get out of my class this instant!"'
 					'You flip him off again on your way out of the door.'
@@ -1418,18 +1427,19 @@ if $ARGS[0] = 'computer':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage1.jpg"></center>'
 			'At the end of class, Mr. Ivanov calls Alyona up to the computer at the front of the class, with the large monitor facing the rest of the class so everyone can see. He asks Alyona to troubleshoot a problem he''s created on a small program. She tries, but fails to figure it out and he arrongantly starts mocking her inability to, as he puts it, "Solve a basic problem that a three year old could have solved by now."'
-			'At that point, Alyona loses it. "Fuck you, you worthless motherfucker! I''m tired of your shit!" Mr. Ivanov is caught off guard and tells her to calm down, but she grabs the small trash can next to his desk, dumps it out and throws it at his empty desk.'
+			'At that point, Alyona loses it. "Fuck you, you worthless motherfucker! I''m tired of your shit!" Mr. Ivanov is caught off guard and tells her to calm down, but she grabs the trash can next to his desk, dumps it out and throws it at his empty desk.'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage2.jpg"></center>'
-				'He fumes. "That''s enough, young lady! I''m taking you to the principal''s office," he says as he starts walking torwards her, but she grabs a chair and violently yells at him. "I''ll smash your fucking head in if you even dare try to touch me, asshole!"'
+				'He fumes. "That''s enough, young lady! I''m taking you to the principal''s office," he says as he starts walking torwards her, but she grabs a chair and threatens him with it.'
+				'"I''ll smash your fucking head in if you even dare try to touch me, asshole!"'
 				'This causes him to stop and take a step back, the whole class stunned. Alyona is known to have a violent streak, but she normally spends most of her time sleeping in class.'
 
 				act 'Keep watching':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage3.jpg"></center>'
 					'"Fine. I won''t touch you, but you''re going to the principal''s office," Mr. Ivanov says somewhat calmly.'
-					'She screams and throws the chair across the room. "Whatever." She heads out of class with Mr. Ivanov trailing behind her.'
+					'She screams and throws the chair across the room before she heads out of class with Mr. Ivanov trailing behind her.'
 					'Once they''re gone, everyone starts talking about what just happened and sending texts on their phones. Neither of them return to class before the bell rings.'
 
 					act 'Leave the classroom': gt 'gschool_lessons', 'short_break'
@@ -1505,33 +1515,34 @@ if $ARGS[0] = 'russian':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Yenotin having no idea why as he tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', rand(4,8)
 				pcs_memory['school_no_panty__anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidentality drop the cloth needed to wipe the board clean and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
+				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidentality drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
 				'"Well?" Mr. Yenotin prods impatiently.'
-				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Yenotin sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
+				'From where Mr. Yenotin sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and, with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', rand(1,5)
 				pcs_memory['school_no_panty_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mr. Yenotin that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mr. Yenotin poses, you have to clean the blackboard, but accidentally drop the cloth with and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mr. Yenotin that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flashlite', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1554,16 +1565,13 @@ if $ARGS[0] = 'russian':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 6:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
-			'During class, there is a loud crash from the back of the room. You and the rest of the class all turn around to see Lesco is still sitting at his desk, but now the desk is laying on its side on the floor. The whole class bursts out laughing at him.'
+			'During class, there is a loud crash from the back of the room and you, along with the rest of the class, turn to see Lesco is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
 			'Lesco quickly wiggles himself out, gets the desk upright again and hurriedly sits down again, blushing furiously all the while. After making sure he''s okay, Mr. Yenotin gets the class back under control and finishes the lesson.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7:
 			if soniaPS = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/classflash.mp4"></video></center>'
-				'Mr. Yenotin engages the class in conversation. Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at Mr. Yenotin, who does his best to ignore them, but you notice his crotch is developing a serious bulge. Sonia notices too and pulls her shirt open, flashing her breasts at him and the rest of the class. He quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk, though his eyes linger on a smiling Sonia.'
-				gs 'arousal', 'voyeur', 5
-				gs 'arousal', 'end'
-				gs 'stat'
+				'Mr. Yenotin engages the class in conversation when Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at him. He does his best to ignore them, but you notice his crotch is developing a serious bulge and he quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				gs 'gschool_lessonsev1', 'russian'
@@ -1590,9 +1598,9 @@ if $ARGS[0] = 'russian':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'
 			'You hear a pained gasp, as do several others. You glance over just in time to see Svyatoslav letting go of Lesco''s underwear. He''s pulled it half way up his back and you wince slightly at what looked like a painful wedgie.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-		elseif scooltiperand =< 13:
+		elseif scooltiperand <= 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class you look around and decide to sit next to...'
+			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Marcus':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
@@ -1712,7 +1720,7 @@ if $ARGS[0] = 'russian':
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Viktoria':
+			act 'Vicky':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
@@ -1815,7 +1823,7 @@ if $ARGS[0] = 'russian':
 					grupvalue[4] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
 					'Not wanting to partake in the bullying, you decide to speak up. "Shut up, Alyona. At least he has an excuse. What''s yours? Drunk again?"'
-					'Alyona reacts as expected. She leaps from her desk and heads straight towards you. "What the fuck did you say to me, bitch?! You don''t know anything about me. Say something like that to me again and I''ll fuck you up!"'
+					'Alyona reacts as expected. She leaps from her desk and heads straight towards you. "What the fuck did you say to me, bitch?! You don''t know anything about me! Say something like that to me again and I''ll fuck you up!"'
 					'Before she reaches you, Mr. Yenotin steps in and defuses the situation, telling Alyona to return to her desk. The class sits in silence for a moment before Mr. Yenotin tells Lesco to read instead. After a while, you notice Marcus looking at you, nodding gratefully.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end

+ 76 - 70
locations/gschool_lessonsev2.qsrc

@@ -16,56 +16,57 @@ if $ARGS[0] = 'geography':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
-			gs'stat'
+			gs 'stat'
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(8,12)
 				pcs_memory['school_no_panty__anal_plug_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard, but while solving it, you accidentally drop the cloth used to wipe the board. You totally forget that not only are you are not wearing panties, your ass is stuffed with a butt plug. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
+				'You''ve been called up to answer the question written on the blackboard, but while solving it, you accidentally drop the cloth used to wipe the board. You totally forget that not only are you are not wearing panties, your ass is stuffed with a butt plug. When you bend over, you feel your skirt rising up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut.'
+				'From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				pcs_memory['school_no_panty_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forget that you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you''re not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow, you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
-			'During class, there is a loud crashing sound from the back of the class. You along with everyone else in the class turn to see that Mefodiy is still sitting at his desk, but now the desk is laying on its side on the floor. The whole class bursts out laughing at him.'
+			'During class, there is a loud crashing sound from the back of the class. You, along with everyone, turn to see that Mefodiy is still sitting at his desk, but the desk is now laying on its side on the floor. The whole class bursts out laughing at him.'
 			'Mefodiy is blushing as he quickly gets out of the desk and gets it back upright and sits back down in it. After making sure he''s okay, Mrs. Sokoloff gets the class back under control and finishes the lesson.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/boobg.mp4"></video></center>'
-			'Glancing over, you notice Vitek reaching around and grabbing the breasts of the girl in front of him. At first she tries to fend him off and tells him to stop, but after a few looks from Mrs. Sokoloff at her making noise, she just gives up and tries to ignore his groping hands.'
+			'Glancing over, you notice Vitek reaching around and grabbing the breasts of the girl in front of him. At first, she tries to fend him off and tells him to stop, but after a few stares from Mrs. Sokoloff, she just gives up and tries to ignore his groping hands.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
-			'You get a alert on your phone, you pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image. Opening the image, you''re greeted by the sight of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
+			'You get an alert on your phone and pull it out of your purse before placing it in your lap. You glance down and see someone has sent you an image. Opening it, you''re greeted by the sight of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you quickly delete the image.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -76,7 +77,7 @@ if $ARGS[0] = 'geography':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'
-			'You hear a pained grasp, as do several others. You glance over just in time to see Valentin letting go of Artem''s underwear. He''s pulled it half way up his back and you wince slightly at what looked like a painful wedgie.'
+			'You hear a pained grasp, as do several others, and glance over just in time to see Valentin letting go of Artem''s underwear. He''s pulled it half way up his back and you wince slightly at what looked like a painful wedgie.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand <= 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
@@ -131,13 +132,13 @@ if $ARGS[0] = 'geography':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Valentin. He gives you a perverted smile and keeps asking if you want ''go for a ride'' with him. "And I don''t mean on my bike, slut," he adds with a wink.'
+					'You sit next to Valentin, who gives you a perverted smile and keeps asking if you want ''go for a ride'' with him. "And I don''t mean on my bike, slut," he adds with a wink.'
 				else
 					if grupTipe = 4:
 						npc_rel['A158'] += 1
 						'You sit next to Valentin and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
-						'You are forced to sit next to Valentin and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+						'You''re forced to sit next to Valentin and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
 					else
 						npc_rel['A158'] += 1
 						'You sit next to Valentin. He''s a little surprised that you chose to do so, but you''re able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
@@ -152,7 +153,7 @@ if $ARGS[0] = 'geography':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Evgeny. He looks at you in disgust, picks up his chess board and finds another seat to play his game.'
+					'You sit next to Evgeny, who looks at you in disgust, picks up his chess board and finds another seat to play his game.'
 				else
 					'You sit next to Evgeny, but he''s so focused on the chess game in front of him that he doesn''t notice you and ignores your efforts to communicate with him.'
 				end
@@ -165,7 +166,7 @@ if $ARGS[0] = 'geography':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Artem. He looks at you in disgust and instead focuses on his coursework.'
+					'You sit next to Artem, who looks at you in disgust and instead focuses on his coursework.'
 				else
 					if grupTipe = 3:
 						npc_rel['A2'] += 1
@@ -192,7 +193,7 @@ if $ARGS[0] = 'geography':
 						npc_rel['A165'] += 1
 						'You sit next to Vanya and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
-						'You sit next to Vanya. He ignores you, instead choosing to lean back and talk with Katja and Vicky.'
+						'You sit next to Vanya, but he ignores you, instead choosing to lean back and talk with Katja and Vicky.'
 					else
 						npc_rel['A165'] += 1
 						'You sit next to Vanya. He''s a little surprised that you chose to do so, but you''re able to strike up a brief conversation with him before you catch Vicky giving you dagger eyes and you turn away.'
@@ -213,7 +214,7 @@ if $ARGS[0] = 'geography':
 						npc_rel['A149'] += 1
 						'You sit next to Lazar and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
-						'You sit next to Lazar. He ignores you, only talking to you if it involves mocking you.'
+						'You sit next to Lazar, but he largely ignores you, only talking to you if it involves mocking you.'
 					else
 						npc_rel['A149'] += 1
 						'You sit next to Lazar. He''s a little surprised that you chose to do so, but seems to enjoy the attention you''re giving him. You''re able to strike up a brief conversation with him before Mrs. Sokoloff asks you to be quiet.'
@@ -228,13 +229,13 @@ if $ARGS[0] = 'geography':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Vitek. He gives you a perverted smile and leans back in his chair to show you the bulge in his pants. "It''s all yours, whore. All you have to do is ask," he says with a wink.'
+					'You sit next to Vitek, who gives you a perverted smile and leans back in his chair to show you the bulge in his pants. "It''s all yours, whore. All you have to do is ask," he says with a wink.'
 				else
 					if grupTipe = 4:
 						npc_rel['A9'] += 1
 						'You sit next to Vitek and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
-						'You are forced to sit next to Vitek and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+						'You''re forced to sit next to Vitek and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
 					else
 						npc_rel['A156'] += 1
 						'You sit next to Vitek. He''s a little surprised that you chose to do so, but you''re able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
@@ -357,7 +358,7 @@ if $ARGS[0] = 'geography':
 					'Everybody quickly settles down and the class goes back to normal.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
-			elseif soniaPS = 1:
+			elseif soniaPS > 0:
 				'"Well, everyone has a bigger cock than you, but why not ask the expert on cocks?" Lazar says before he turns to Sonia. "Is there any truth to this ''fact'', Sonia?"'
 				'Sonia blushes heavily and avoids answering, but the smirk on her lips betrays her thoughts.'
 				'"I knew it!" Lazar grins and Sonia blushes even more.'
@@ -404,26 +405,26 @@ if $ARGS[0] = 'math':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Mr. Tsarev calls you up to the blackboard to answer a question. You start solving the problem, but accidentally drop the chalk on the floor. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Tsarev having no idea why as he tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Tsarev having no idea why as he tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Tsarev  having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Tsarev having no idea why as he tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(8,12)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you are not wearing any panties and giving everyone in the class a clear view of your pussy, as well as the butt plug currently stuffed in your asshole. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
+				'Mr. Tsarev calls you up to the blackboard to answer a question. As you start solving the problem, you accidentally drop the chalk on the floor and quickly bend over to pick it up, having forgot that you''re not wearing any panties and giving everyone in the class a clear view of your pussy, as well as the butt plug currently stuffed in your asshole. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
 				*nl
-				'Dimka: "Damn <<$pcs_nickname>>, you getting that ass loose for later?"'
-				'Igor: "Yeah, you have some nice holes there <<$pcs_nickname>>."'
+				'"Damn <<$pcs_nickname>>, you getting that ass loose for later?" Dimka laughs.'
+				'"Yeah, you have some nice holes there, <<$pcs_nickname>>," Igor adds.'
 				if npc_grupTipe['A189'] = 4 and NikoVolkovQW >= 5 and NikoPayback = 0:
 					'"That''s my girl right there," Niko says with a smirk.'
 				elseif npc_grupTipe['A189'] = 4 and NikoPayback > 0:
@@ -431,15 +432,16 @@ if $ARGS[0] = 'math':
 				elseif npc_grupTipe['A189'] = 4:
 					'"Looking good, <<$pcs_nickname>>," Niko grins.'
 				end
-				'You look around the classroom, confused as to what they are talking about when you hear Julia whisper to you while pointing at your ass. "Psst <<$pcs_firstname>>, your skirt." You suddenly feel your face grow red when you realize what she meant. You quickly solve the problem on the board then return to your seat with your head held down while Mr. Tsarev tries to calm the class, unaware of what has them all riled up.'
+				'You look around the classroom, confused as to what they''re talking about when you hear Julia whisper while pointing at your ass. "Psst, <<$pcs_firstname>>... Your skirt!"'
+				'You suddenly feel your face grow red when you realize what she meant. You quickly solve the problem on the board and return to your seat with your head held down as Mr. Tsarev tries to calm the class, unaware of what has them all riled up.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you aren''t wearing any panties and giving everyone in the class a clear view of both of your holes. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
 				*nl
-				'Dimka: "Damn <<$pcs_nickname>>, you certainly know how how to put on a show."'
-				'Igor: "Yeah, you have some nice holes there <<$pcs_nickname>>."'
+				'"Damn <<$pcs_nickname>>, you certainly know how how to put on a show!" Dimka laughs.'
+				'"Yeah, you have some nice holes there, <<$pcs_nickname>>!" Igor adds.'
 				if npc_grupTipe['A189'] = 4 and NikoVolkovQW >= 5 and NikoPayback = 0:
 					'"That''s my girl right there," Niko says with a smirk.'
 				elseif npc_grupTipe['A189'] = 4 and NikoPayback > 0:
@@ -488,7 +490,7 @@ if $ARGS[0] = 'math':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
-			'As the lesson goes on, you receive a message on your phone. You open it to see that someone has sent you an image of someone''s penis. You can hear some snickering and you quickly look around to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you delete the image.'
+			'As the lesson goes on, you receive a message on your phone. You open it to see that someone has sent you an image of a dick. You can hear some snickering and you quickly look around to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you quickly delete the image.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -528,7 +530,7 @@ if $ARGS[0] = 'math':
 			end
 		elseif scooltiperand = 8:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teachdis.jpg"></center>'
-			'You listen closely to every word Mr. Tsarev says, doing your best to learn, but you occasionally notice Mr. Tsarev staring at your legs when he believes that you aren''t looking.'
+			'You listen closely to every word Mr. Tsarev says, doing your best to pay attention, but you occasionally notice Mr. Tsarev staring at your legs when he believes that you aren''t looking.'
 			act 'Straighten your skirt':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teachdis.jpg"></center>'
@@ -601,7 +603,7 @@ if $ARGS[0] = 'math':
 					*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.'
-					'Flustered, Mr. Tsarev leaves the classroom for a moment to collect his thoughts. Your classmates, unsure of what just happened, softly talk with one another. After a minute or so, Mr. Tsarev and resumes his lesson as if nothing had happened, carefully avoiding eye contact with you. Everyone in class is very surprised that you didn''t get kicked out after what just happened.'
+					'Flustered, Mr. Tsarev leaves the classroom to collect his thoughts. Your classmates, unsure of what just happened, softly talk with one another. After a minute or so, Mr. Tsarev and resumes his lesson as if nothing had happened, carefully avoiding eye contact with you. Everyone in class is very surprised that you didn''t get kicked out after what just happened.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
@@ -617,21 +619,21 @@ if $ARGS[0] = 'math':
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/chrissoniabully.jpg"></center>'
-			'Sonia and Christina are called to the front to both work on the same problem to see who can get it done faster. Christina stops in the middle of it, grabs the back of Sonia''s skirt and pulls it up, showing off her ass cheeks as she is wearing a thong. This gets a lot of hoots and hollers from the rest of the class. Mr. Tsarev tries several times to get the class back in order and sends both girls to sit back down.'
+			'Sonia and Christina are called to the front to both work on the same problem to see who can get it done faster. Christina stops in the middle of it, grabs the back of Sonia''s skirt and pulls it up, showing off her ass cheeks as she''s wearing a thong. This gets a lot of hoots and hollers from the rest of the class. Mr. Tsarev tries several times to get the class back in order and sends both girls to sit back down.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/larskirtup.jpg"></center>'
-			'During class, Lariska leans forward in her seat to talk to Christina, who is sitting in front of her. As she does Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty-clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
+			'During class, Lariska leans forward in her seat to talk to Christina, who is sitting in front of her. As she does, Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty-clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 12 and soniaPS = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/soniachair.jpg"></center>'
-			'As class ends, Mr. Tsarev gives the class the last five minutes to do what they want. Some students talk to their fellow students next to them and a few get up and walk around. Sonia gets up and tries to step over a desk, but ends up straddling the back of a chair. Instead of stepping the rest of the way over it, she stops and bites her lower lip, then scoots back and forth along the chair. Before anyone really notices what she''s doing, the bell rings and everyone leaves.'
+			'Mr. Tsarev gives the class the last five minutes to do what they want. Some students talk to their fellow students next to them and a few get up and walk around. Sonia gets up and tries to step over a desk, but ends up straddling the back of a chair. Instead of stepping the rest of the way over it, she stops and bites her lower lip, then scoots back and forth along the chair. Before anyone really notices what she''s doing, the bell rings and everyone leaves.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -654,9 +656,11 @@ if $ARGS[0] = 'math':
 						christinaQW['bully'] -= 1
 						stat_memory['lariska_pussy_shot'] = 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare5.jpg"></center>'
-						'You shake your head and Christina and Lariska taunt you for not doing it. "Come on you pussy. Don''t be a little bitch and just do it."'
-						'You keep up your resolve, shaking your head again and then hiss to Lariska. "Why don''t you do it?"'
-						'Christina nods and says to Lariska "Show her you''re no pussy." Lariska looks around and then puts her phone under her skirt for a moment, then pulls it back up. You lean over to glance and can see a close up image of her pussy. She then sends it through the school wifi to Mr. Tsarev, who stops what he is doing when his phone buzzes and looks at it. There is a shocked look on his face for a moment before he looks around at the class, obviously trying to figure out who sent it. A few minutes later, the bell to end class rings.'
+						'You shake your head and Christina and Lariska taunt you. "Don''t be such a little bitch and just do it!"'
+						'You keep up your resolve, shaking your head again. "Why don''t you do it?" you hiss at Lariska.'
+						'Christina nods. "Yeah, show her you''re no pussy, Lariska!"'
+						'Lariska looks around before she puts her phone under her skirt, then pulls it back up. You lean over and see a close up image of her pussy, which she sends anonymously through the school wifi to Mr. Tsarev, who stops what he''s doing when his phone buzzes and looks at it.'
+						'There''s a shocked look on his face for a moment before he looks around at the class, trying to figure out who sent it. Luckily for Lariska, the bell soon rings.'
 						act 'Leave class': gt 'gschool_lessons', 'short_break'
 					end
 
@@ -667,10 +671,10 @@ if $ARGS[0] = 'math':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare4.jpg"></center>'
 						if $pantyworntype ! 'none':
 							gs 'flash', 'panties', 'indoors', 1, 1
-							'You bite your lip, look around and figure why not? A thrill of excitement runs down your spine at what you are about to do. You make sure no one else is watching, then spread your legs, pull up your skirt and pull your panties aside until your pussy is exposed and take a photo. You quickly pull your panties back in place and pull your skirt back down once you have the picture.'
+							'You bite your lip, a thrill of excitement running down your spine at what you''re about to do. You make sure no one else is watching before you pull up your skirt and pull your panties aside, exposing your pussy for you to take a photo. You quickly pull your panties back in place and pull your skirt back down once you have the picture.'
 						else
 							gs 'flash', 'pussy', 'indoors', 1, 1
-							'You bite your lip, look around and figure why not? A thrill of excitement runs down your spine at what you are about to do. You make sure no one else is watching, then spread your legs and pull up your skirt, exposing your pussy since you are not wearing panties and take a photo of your pussy. You quickly pull your skirt back down once you have the picture.'
+							'You bite your lip, a thrill of excitement running down your spine at what you'''re about to do. You make sure no one else is watching before you spread your legs and pull up your skirt, exposing your already bare pussy and taking a photo. You quickly pull your skirt back down once you have the picture.'
 						end
 						gs 'arousal', 'flash', -5, 'exhibitionism'
 						gs 'arousal', 'end'
@@ -678,7 +682,7 @@ if $ARGS[0] = 'math':
 						act 'Send the image':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare5.jpg"></center>'
-							'You send the image anonymously through the school wifi to Mr. Tsarev, who stops what he''s doing when his phone buzzes and looks at it. There''s a shocked look on his face for a moment before he looks around, trying to figure out who sent it. Luckily for you, the bell to end class soon rings.'
+							'You send the image anonymously through the school wifi to Mr. Tsarev, who stops what he''s doing when his phone buzzes and looks at it. There''s a shocked look on his face before he looks around, trying to figure out who sent it. Luckily for you, the bell soon rings.'
 							act 'Leave class': gt 'gschool_lessons', 'short_break'
 						end
 					end
@@ -738,12 +742,12 @@ if $ARGS[0] = 'help':
 		'"I live near the factory in one of the standalone houses," he replies. "Anyway, about the lesson..."'
 		'You ignore his attempt to get back to teaching and nod. "How about Valeria? Do you and her get along?"'
 		*nl
-		'His face saddens. "We don''t talk much. Her mother and I both work, so no one keeps an eye on her. Unfortunately I can only really talk to her on weekends. On weekdays, she always comes home too late and drunk to have any kind of conversation."'
+		'His face saddens. "We don''t talk much. Her mother and I both work, so no one keeps an eye on her. Unfortunately, I can only really talk to her on weekends. On weekdays, she always comes home too late and drunk to have any kind of conversation."'
 		act 'Seduce':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teacherhelp.jpg"></center>'
 			'You smile at him empathetically and put your hand on his shoulder. "Would you like me to talk with her? Your daughter doesn''t know what she''s missing because I would kill to have a father as great as you! How about you take me home sometime, to talk to her?"'
 			'"That''s a kind offer, but I need to solve my issues on my own," he replies.'
-			'You lightly squeeze on his shoulder. "Are you sure? I''d love to come home with you someday. Maybe you can tutor me? I''m sure that a strong man like you can teach me many things..."'
+			'You lightly squeeze on his shoulder. "Are you sure? I''d love to come home with you some day. Maybe you can tutor me? I''m sure that a strong man like you can teach me many things..."'
 			'His eyes widen. "Uhh... Maybe some other time. I should let you get back to work," he says before he stands up and returns to his desk. You notice him sweating more than usual.'
 		end
 		act 'Be helpful':
@@ -773,17 +777,17 @@ if $ARGS[0] = 'history':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes, leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mrs. Sokoloff having no idea why as she tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
@@ -792,17 +796,17 @@ if $ARGS[0] = 'history':
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
 				'"Well?" Mrs. Sokoloff prods impatiently.'
-				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forgoe that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mrs. Sokoloff poses, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tells you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow, you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
@@ -968,7 +972,7 @@ if $ARGS[0] = 'history':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
-			'You get an alert on your phone and pull it out of your purse before placing it in your lap. You glance down and see someone has sent you an image; opening it, you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
+			'You get an alert on your phone and pull it out of your purse before placing it in your lap. You glance down and see someone has sent you an image; opening it, you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you quickly delete the image.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -979,7 +983,7 @@ if $ARGS[0] = 'history':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'
-			'You hear a pained gasp, as do several others and glance over just in time to see Roman letting go of Igor''s underwear. He''s pulled it half way up his back and you wince slightly at what looked like a painful wedgie.'
+			'You hear a pained gasp, as do several others, and glance over just in time to see Roman letting go of Igor''s underwear. He''s pulled it half way up his back and you wince slightly at what looked like a painful wedgie.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
@@ -1052,7 +1056,7 @@ if $ARGS[0] = 'history':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Petka. He looks at you in disgust and instead focuses on his coursework.'
+					'You sit next to Petka, who looks at you in disgust and instead focuses on his coursework.'
 				else
 					if grupTipe = 3:
 						npc_rel['A6'] += 1
@@ -1115,7 +1119,8 @@ if $ARGS[0] = 'history':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Igor, who just stares at you before looking around for somewhere else to sit. "God, I have to sit next to the bike?" he moans when he can''t find anywhere to go.'
+					'You sit next to Igor, who just stares at you before looking around for somewhere else to sit.'
+					'"God, I have to sit next to the bike?" he moans when he can''t find anywhere to go.'
 				else
 					if grupTipe = 1:
 						npc_rel['A4'] += 1
@@ -1136,7 +1141,7 @@ if $ARGS[0] = 'history':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 				gs 'exp_gain', 'chrsm', rand(1,2)
 				if fame['pav_slut'] >= 150:
-					'You sit next to Niko, who makes crude remarks about how you should under his desk and on your knees sucking his dick like a good little slut.'
+					'You sit next to Niko, who makes crude remarks about how you should be on your knees under his desk, sucking his dick like a good little slut.'
 				else
 					if grupTipe = 4:
 						npc_rel['A189'] += 1
@@ -1180,12 +1185,12 @@ if $ARGS[0] = 'history':
 			end
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/history/lenatchair.jpg"></center>'
-			'At the end of class, Mrs. Sokoloff asks the class to study quietly as she leaves the classroom a few minutes. Most of the students start talking or get up and start walking around as soon as she leaves. Lena on the other hand, walks up to Mrs. Sokoloff''s desk, sits down in her chair and starts rolling and spinning around on it, seemingly having the time of her life.'
+			'At the end of class, Mrs. Sokoloff asks the class to study quietly as she leaves the classroom for a few minutes. Most of the students start talking or get up and start walking around as soon as she leaves. Lena on the other hand, walks up to Mrs. Sokoloff''s desk, sits down in her chair and starts rolling and spinning around on it, seemingly having the time of her life.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/history/lenlerskirt.jpg"></center>'
 			'At the end of class, Mrs. Sokoloff asks the class to study quietly as she grades some papers. Most of the students do just that, but when it''s obvious that Mrs. Sokoloff isn''t paying attention, a few students start talking quietly. Lena gets up and sits on Lera''s desk, facing Lera with her legs spread before she pulls Lera''s head down to her crotch and pulls her skirt up over Lera''s head.'
-			'You have no idea if Lera is really going down on her in the middle of class or not, but Mrs. Sokoloff notices and yells at Lena to get off the desk. She calls Lena up to her desk where she gives her a stern lecture until the bell rings.'
+			'You have no idea if Lera is actually going down on her in the middle of class, but Mrs. Sokoloff notices and yells at Lena to get off the desk. She calls then her up to her desk, where she gives her a stern lecture until the bell rings.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1245,17 +1250,17 @@ if $ARGS[0] = 'shop':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Kuznetsov having no idea why as he tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
@@ -1264,12 +1269,12 @@ if $ARGS[0] = 'shop':
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth and hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed with a butt plug.'
 				*nl
 				'"Well?" Mr. Kuznetsov prods impatiently.'
-				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Kuznetsov sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
+				'With a coy smile, you slowly bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Kuznetsov sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and, with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
 			elseif $pantyworntype = 'none' and analplugin = 0:
 				gs 'arousal', 'flash', -5, 'exhibitionism'
 				gs 'fame', 'pav', 'sex', rand(1,4)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mr. Kuznetsov that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
+				'Before you can answer the question Mr. Kuznetsov poses, you have to clean the blackboard, but accidentally drop the cloth and totally forget that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both your holes are on display for everyone to see. Everyone but Mr. Kuznetsov that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex', 1
@@ -1641,9 +1646,10 @@ if $ARGS[0] = 'shop':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shop/paulnushhump.jpg"></center>'
-			'Near the end of class, Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he is gone no one listens and everyone starts wandering around messing with the tools. Meanwhile, Anushka starts to tease Fedor, asking him if he wants to fuck her until she makes him blush. When he finally admits he is attracted to her, Pauline swoops in behind Anushka, pushes into her and pulls up the back of her skirt.'
-			*nl
-			'She starts pounding her hips against Anushka''s ass. "Oh Anushka you''re so hot, I have always wanted to fuck you." Pauline says, obviously trying to sound like Fedor, and Anushka plays along. "Oh Fedor, you have such an almost average-sized dick! It almost feels good!" This gets the rest of class laughing and Fedor blushing even more. His humiliation ends when the bell rings.'
+			'Near the end of class, Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he''s gone, no one listens and everyone starts wandering around messing with the tools. Meanwhile, Anushka starts teasing Fedor, asking if he wants to fuck her. When he finally admits he''s attracted to her, Pauline swoops in behind Anushka, pushes into her and pulls up the back of her skirt.'
+			'She starts pounding her hips against Anushka''s ass. "Oh Anushka, you''re so hot! I''ve always wanted to fuck you!" Pauline says, trying to sound like Fedor.'
+			'Anushka plays along. "Oh Fedor, you have such an almost average-sized dick! It almost feels good!"'
+			'This gets the rest of class laughing and Fedor blushing even more. His humiliation only ends when the bell rings.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1685,11 +1691,11 @@ if $ARGS[0] = 'shop_punishment':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/ruslan/sex/pshop1.jpg"></center>'
 	Kuznetsov_punishment_count += 1
 	if grupTipe = 3 or Kuznetsov_punishment_count < 5:
-		'After your final class, you go to the school offices and knock on Mr. Kuznetsov''s door. After a few seconds, you hear him tell you to enter and walk in to see him sitting behind his desk reading a book. You walk up to his desk and wait as he continues to read until he finally looks up at you and puts the book down.'
+		'After your final class, you go to the school offices and knock on Mr. Kuznetsov''s door. After a few seconds, you hear him telling you to enter and walk in to see him sitting behind his desk reading a book. You walk up to his desk and wait as he looks up at you and puts the book down.'
 		'"I don''t know what''s gotten into you lately, but whatever it is needs to stop." He pauses, but before you can even consider saying anything in your defense, he starts speaking again. "If it doesn''t, then I''ll have to assume you''re going to become a problem student and treat you accordingly. If this starts to become a regular thing with you, the punishment will become a lot more severe. More than just a few demerits on your record. Now get out of my office."'
 		'Knowing better than to say anything, you turn and leave.'
 		school_period = 0
-		act 'Leave' : gt 'gschool_grounds', 'main'
+		act 'Leave': gt 'gschool_grounds', 'main'
 	else
 		'After your final class, you go to the school offices and knock on Mr. Kuznetsov''s door. After a few seconds, you hear him tell you to enter and walk in to see him sitting behind his desk reading a book. You walk up to his desk and wait as he continues to read until he finally looks up at you and puts the book down.'
 		'He looks you over. "Here you are again, my favorite problem student. You know why you''re here and I won''t stand for you disrespecting me in my class." He pauses, leaving you unsure if you should say anything. The silence stretches out with him just staring at you and you feel the need to say something.'

+ 17 - 17
locations/gschool_lessonsev3.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'literature':
 		scooltiperand = rand(1,14)
 		if scooltiperand = 1:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			'During a rare moment of quietness, you take the opportunity to stretch and look around the room. Your attention settles on Igor, who is working quietly by himself, which is an odd sight to see as he''s usually attached to Dimka''s hip. As you continue to watch him, it dawns on you that, without his popular friend around, no one really wants to talk or hang out with him. Maybe those rumors of Dimka being his only friend are true?'
+			'During a rare moment of quietness, you take the opportunity to stretch and look around the room. Your attention settles on Igor, who is working quietly by himself, which is an odd sight as he''s usually attached to Dimka''s hip. As you continue to watch him, it dawns on you that, without his popular friend around, no one really wants to talk or hang out with him. Maybe those rumors of Dimka being his only friend are true?'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 2:
 			*clr & cla
@@ -76,17 +76,17 @@ if $ARGS[0] = 'literature':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Ms. Braakman poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Ms. Braakman poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Ms. Braakman having no idea why as she tries to shout for order.'
 				end
 			elseif $pantyworntype = 'none':
 				gs 'arousal', 'flash', -5
@@ -203,7 +203,7 @@ if $ARGS[0] = 'literature':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'During class, you overhear Feofan excitedly telling a boy about the last convention he attended.'
-			'"Feofan, not to be rude, but I don''t really care," the boy says.'
+			'"Not to be rude, Feofan, but I don''t really care," the boy says.'
 			'"Just wait, I haven''t gotten to the best part!" Feofan says before continuing. You can''t tell if he lacks self-awareness or is just really thick.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 9:
@@ -223,7 +223,7 @@ if $ARGS[0] = 'literature':
 		elseif scooltiperand = 12:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/lizupskirt.jpg"></center>'
-			'Ms. Braakman announces a pop quiz and everyone groans. You finish your quiz and get up to turn it in; when you walk back to your desk, you notice Lizaveta is still working on her''s. She seems so intent on it that she doesn''t realize she has her legs slightly apart, giving an up the skirt shot of her panties.'
+			'Ms. Braakman announces a pop quiz and everyone groans. You finish your quiz and get up to turn it in; when you walk back to your desk, you notice Lizaveta is still working on her''s. She seems so intent on it that she doesn''t realize she has her legs slightly apart, giving you an up the skirt shot of her panties.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -895,17 +895,17 @@ if $ARGS[0] = 'music':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard, but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thighs. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
-				elseif cum_loc['anus'] > 0:
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
+				elseif cum_loc['anus'] > 0:,
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				end
 			elseif $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
@@ -1366,24 +1366,24 @@ if $ARGS[0] = 'art':
 			if $pantyworntype = 'none' and analplugin = 0 and (cum_loc['vagina'] > 0 or cum_loc['anus'] > 0):
 				pcs_memory['school_no_panty_cum_flash'] = daystart
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard but accidentally drop the cloth used to wipe it clean. As you bend over to pick it up you suddenly feel something <i>spurt</i> down your legs.'
+				'Before you can answer the question Mr. Vasilyev poses, you have to clean the blackboard, but accidentally drop the cloth. As you bend over to pick it up, you suddenly feel something <i>spurt</i> down your leg.'
 				*nl
 				if cum_loc['vagina'] > 0 and cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also both your holes, leaking cum and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+					'There are histling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so are both your holes leaking cum that''s dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from your pussy and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
-					'Whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you and you realize that not only is your complete lack of panties on display for everyone to see, but also the cum leaking from between your ass cheeks and dribbling down your thighs. You quickly straighten up but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as she tries to shout for order.'
+					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				end
 				
 			elseif $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex',  1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow, you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
 				gs 'arousal', 'flash', -5
 				gs 'fame', 'pav', 'sex',  2

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 188 - 155
locations/gschool_post_shower.qsrc


+ 63 - 44
locations/gschool_sex.qsrc

@@ -1372,18 +1372,19 @@ end
 if $ARGS[0] = 'petka_magic_dick':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging1.jpg"></center>'
-	'You feel the magic courses from the dildo, through the harness and into your body. You give the dildo a test stroke, you can feel your hand grabbing the dildo as it slides up and down the shaft. You have to admit it feels pretty wonderful, then you notice Petka watching you. You know he saw none of that, as far as he knows and can see you are just stroking a strapon dildo, you are looking forward to this.'
-	*nl
-	'You look at Petka where he waits meekly, already cowed by you. Seeing him so submissive sends a thrill down your spine as you point at the ground in front of you. "Come over here and suck my dick, bitch!"'
+	'You feel the magic coursing from the dildo through the harness and into your body. You give the dildo a test stroke and feel your hand grabbing the dildo as it slides up and down the shaft. You have to admit that it feels pretty wonderful as you notice Petka watching you.'
+	'He waits meekly, already cowed by you. Seeing him so submissive sends a thrill down your spine as you point at the ground in front of you. "Come over here and suck my dick, bitch!"'
 	'He eyes you with fear and then slowly starts to crawl over. "Now!" you shout. "Or this will only get worse for you. Maybe I should call the coach in here?"'
-	'That did the trick. He scrambles over quickly and starts sucking on your strapon dildo, you can feel his lips wrap around the shaft and the warmth from his mouth. You grab the back of his head with your hand and start forcing him to deep-throat your dick.'
+	'That did the trick. He scrambles over quickly and you feel his lips wrap around the shaft as he starts sucking the dildo. You grab the back of his head with your hand and start forcing him to deepthroat you.'
 	gs 'arousal', 'magicd_bj', 2, 'dom'
 	gs 'stat'
 	act 'Get it nice and wet':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging2.jpg"></center>'
-		'You moan like you have heard guys do when they''re getting a blowjob, no wonder they do, this feels amazing. As you force your dildo deeper down his throat, it feels even better, you barely even notice this is making him gag several times. "That''s it, suck my dick. You better get it nice and wet because this is all the lube you''re going to get." He looks up at you with worry in his eyes as he surprisingly sucks your dick skillfully like a pro.' 
-		'You pull his head off your dick. "Now turn around." He hesitates for only a moment before he stands up and turns around.'
+		'You moan at the wonderful sensation as you force your dildo deeper down his throat. "That''s it, suck my dick. You better get it nice and wet because this is all the lube you''re going to get."'
+		'He looks up at you with worry in his eyes as he surprisingly sucks your dick skillfully like a pro.' 
+		'You pull his head off your dick. "Turn around."'
+		'He hesitates for only a moment before he stands up and turns around.'
 		gs 'arousal', 'magicd_bj', 2, 'dom'
 		gs 'stat'
 		if mc_inventory['lubricant'] > 0:
@@ -1391,7 +1392,9 @@ if $ARGS[0] = 'petka_magic_dick':
 				mc_inventory['lubricant'] -= 1
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging3.jpg"></center>'
-				'You push him forward until he''s bent over. "You''re such a good little cock sucker! I''m going to reward you and use some lube." You get some of your lube and lube up the dildo, then squirt some on his ass and lube it up. With his asshole and your dildo lubed up, you step up behind him and line the dildo up until it pushes against his asshole. You keep pushing against it as he tenses up before your dildo suddenly pops into his ass and he cries out in pain. While you moan deeply as his asshole tightly grips your dick, grabbing his hips to hold him in place, you start fucking his ass.'
+				'You push him forward until he''s bent over. "You''re such a good little cock sucker! I''m going to reward you and use some lube."'
+				'You get some of your lube and lube up the dildo, then squirt some on his ass and lube it up. With his asshole and your dildo lubed up, you step up behind him and line the dildo up until it pushes against his asshole.'
+				'You keep pushing against it as he tenses up before your dildo suddenly pops into his ass and he cries out in pain while you moan deeply as his asshole tightly grips your dick. Grabbing his hips to hold him in place, you start fucking his ass.'
 				gs 'arousal', 'magicd_anal', 3, 'dom'
 				gs 'stat'
 				act 'Keep fucking his ass': gt 'gschool_sex', 'petka_magic_dick_anal'
@@ -1401,7 +1404,8 @@ if $ARGS[0] = 'petka_magic_dick':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A6', 'dislike'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging3.jpg"></center>'
-			'You push him forward until he''s bent over. "Spread your cheeks," you command and he grabs his ass cheeks and spreads them as you spit in the crack of his ass a few times and watch your saliva run down to his asshole. You rub the tip of your dildo against your spit on his ass and work it in, along with his saliva on your dildo. You feel him tense up and eventually hiss a little in pain as you keep pushing against his asshole with your dildo. The pressure builds up until your dildo suddenly pops into his ass and he cries out in pain. While you moan deeply as his asshole tightly grips your dick. He tries to pull away from you, but you were ready for that, however. You grab his hips and pull him back as you start fucking his ass.'
+			'You push him forward until he''s bent over. "Spread your cheeks," you command and he grabs his ass cheeks and spreads them as you spit in the crack of his ass a few times and watch your saliva run down to his asshole. You rub the tip of your dildo against your spit on his ass and work it in, along with his saliva on your dildo. You feel him tense up and eventually hiss a little in pain as you keep pushing against his asshole with your dildo.'
+			'The pressure builds up until your dildo suddenly pops into his ass and he cries out in pain while you moan deeply as his asshole tightly grips your dick. He tries to pull away, but you''re ready for it. You grab his hips and pull him back as you start fucking his ass.'
 			gs 'arousal', 'magicd_anal', 1, 'dom'
 			gs 'stat'
 			act 'Keep fucking his ass': gt 'gschool_sex', 'petka_magic_dick_anal'
@@ -1413,20 +1417,22 @@ if $ARGS[0] = 'petka_magic_dick_anal':
 	*clr & cla
 	petkasub += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging4.jpg"></center>'
-	'As you fuck his ass with your dick, his groans of pain slowly start giving way to moans of pleasure. You notice him reach between his legs and start jerking off as you fuck his ass.'
-	'You grin, as this feels amazing, as his tight little asshole squeezes the shaft of your dick. "Tell me you like taking my cock up your ass." His tight little asshole is gripping your dick tightly.'
+	'As you fuck his ass, his groans of pain slowly start giving way to moans of pleasure. You notice him reach between his legs and start jerking off as you fuck his ass.'
+	'You grin as you feel his asshole squeeze the shaft of your dick. "Tell me you like taking my cock up your ass."'
 	'He moans in pleasure. "Yes, it feels so good."'
 	'You slap his ass and stop moving. "Beg me to fuck your ass."'
-	'He glances back at you. "Please fuck my ass!" he begs. Since he''s begging, you start really fucking his ass hard and fast. He both groans in pain and moans in pleasure, but it sounds like the moans are louder. While you moan louder in pleasure as your balls start to slap against him, as you go balls deep into his butt.'
+	'He glances back at you. "Yes, please! Please fuck my ass!" he begs.'
+	'In response, you start really fucking his ass hard and fast, moaning loudly in pleasure as you go balls deep into his ass.'
 	gs 'arousal', 'magicd_anal', 3, 'dom'
 	gs 'stat'
 	act 'Fuck your buttslut':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A6', 'like'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/pegging5.jpg"></center>'
-		'You pound his ass, slamming yourself balls deep into his butt. Both of you are moaning loudly in pleasure, the sensation of fucking him with your animated dick is amazing. "You really love getting fucked in the ass, don''t you? You''re such a dirty little slut."'
-		'He moans. "Yes! I''ll be your slut."'
-		'His words send a thrill of excitement through your body. Having someone be so submissive that they are just letting you use their holes for your own pleasure, arouses you greatly. But this, this is so much better, able to feel the tightness of his asshole, as you fuck his ass balls deep, is just divine. You are starting to feel the build up from the fake balls, you can tell you are about to cum.'
+		'You pound his ass, slamming yourself balls deep into him as you moan loudly in pleasure, the sensation of fucking him with your animated dick feeling strange, yet amazing.'
+		'"You really love getting fucked in the ass, don''t you? You''re such a dirty little slut!" you laugh.'
+		'He moans in response. "Yes! I''ll be your slut."'
+		'His words send a thrill of excitement through your body. Being able to feel the tightness of his asshole as you fuck his ass is just divine and you feel the build up in your fake balls. You''re about to cum!'
 		gs 'arousal', 'magicd_anal', 3, 'dom'
 		gs 'stat'
 		act 'Pull out':
@@ -1434,26 +1440,26 @@ if $ARGS[0] = 'petka_magic_dick_anal':
 			'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_butt_cum' + rand(1,2) + '.jpg"></center>'
 			gs 'arousal', 'magicd_anal', 3, 'dom'
 			$orgasm_or = 'yes'
-			$orgasm_txt = 'You pull out of him just in the nick of time, you feel the balls from the strapon dildo tighten up and then the sudden release, as you feel the cum shooting out of the dildo. You moan loudly as you shot several loads of your cum all over his ass, stroking your dick you milk every last drop out of it. You find yourself panting as the feeling of release and now empty feeling your balls makes for such an amazing afterglow.'
-			'Once you finish he looks back at you. "What was that?" He asks as he reaches back to feel your wet cum all over his butt.'
-			'You freeze for just a second before saying. "Don''t worry about it, it''s fake cum. A lot of these dildo''s have them nowadays."'
-			'As he stands up he looks at you confused and then seems to accept it. "Oh..."'
+			$orgasm_txt = 'You pull out and feel the sudden release as cum starts shooting out of the dildo. You moan loudly as you shoot several loads of your cum all over his ass, stroking your dick as you milk every last drop out of it. You find yourself panting as the feeling of release makes for such an amazing afterglow.'
+			'Once you finish he looks back at you. "What was that?" he asks as he reaches back to feel your wet cum on his ass.'
+			'"Don''t worry about it, it''s just fake cum. A lot of these dildos have them nowadays," you quickly reply.'
+			'As he stands up, he looks at you in confusion, but seems to accept it. "Oh..."'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Tell him to get lost': gt 'gschool_sex', 'petka_home'
 			act 'Tell him to do your homework': gt 'gschool_sex', 'petka_homework_magic'
 			act 'Take his clothes': gt 'gschool_sex', 'petka_homenaked_magic'
 		end
-		act 'Cum inside of him':
+		act 'Cum inside him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_internal_butt_cum1.jpg"></center>'
-
 			gs 'arousal', 'magicd_anal', 3, 'dom'
 			$orgasm_or = 'yes'
-			$orgasm_txt = 'As the pressure builds you keep fucking his ass and then bury your dick balls deep into his ass. You feel your dick twitch as you empty your balls into his butt, you moan loudly as you fill his ass with your cum. You give him a couple of more strokes to milk the last drop of cum out of you, as you do, you can feel some of the cum leaking out of his butt.'
-			'Once you pull your dick out and step back, you can see the cum now leaking out of his gaping asshole. You find yourself panting as the feeling of release and the feeling of your balls emptying makes for such an amazing afterglow. Once you finish he looks back at you. "What was that?" He asks as he reaches back to feel your wet cum leaking out of his butt.'
-			'You freeze for just a second before saying. "Don''t worry about it, it''s fake cum. A lot of these dildo''s have them nowadays."'
-			'As he stands up he looks at you confused and then seems to accept it. "Oh..."'
+			$orgasm_txt = 'You keep fucking his ass before you bury your dick balls deep into his ass. You moan loudly and feel your dick twitching as you fill his ass with your cum. You milk the last drop of cum out of you as you feel some of it leaking out of him.'
+			'Once you pull your dick out and step back, you can see the cum now leaking out of his gaping asshole. You find yourself panting as the feeling of release makes for such an amazing afterglow.'
+			'Once you finish, he looks back at you. "What was that?" he asks as he reaches back to feel your cum leaking out of him.'
+			'"Don''t worry about it, it''s just fake cum. A lot of these dildos have them nowadays," you quickly reply.'
+			'As he stands up, he looks at you in confusion, but seems to accept it. "Oh..."'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Tell him to get lost': gt 'gschool_sex', 'petka_home'
@@ -1495,13 +1501,15 @@ if $ARGS[0] = 'petka_ride':
 	gs 'npc_relationship', 'modify', 'A6', 'like'
 	gs 'boyStat', 'A6'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaride1.jpg"></center>'
-	'"Lie down on the bench," you tell him. At your command, he lies down on his back as you walk over and straddle him. You reach down to take hold of his cock as you lower yourself down, guiding it to your entrance. Once you feel the tip of his dick against your slit, you lower yourself and it slides into your wet pussy, causing you both to moan in pleasure. You let go of his dick and slowly lower yourself further, taking all of his <<dick>>cm <<$dick_girth>> dick inside you as you start riding him cowgirl style, enjoying the control and sensation.'
+	'"Lie down on the bench," you tell him. At your command, he lies down on his back as you walk over and straddle him. You reach down to take hold of his cock as you lower yourself down, guiding it to your entrance. Once you feel the tip of his dick against your slit, you lower yourself and it slides into your wet pussy, causing you both to moan in pleasure.'
+	'You let go of his dick and slowly lower yourself further, taking all of his <<dick>>cm <<$dick_girth>> dick inside you as you start riding him cowgirl style, enjoying the control and sensation.'
 	gs 'arousal', 'vaginal', 3, 'dom'
 	gs 'stat'
 	act 'Reverse cowgirl':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaride2.jpg"></center>'
-		'You lift one leg and spin yourself around, with his dick still inside of you, until you''re facing the other way. Putting your foot back down, you start riding him in reverse cowgirl style, completely controlling the rhythm and depth. You ride him a bit more before you hear him grunting, telling you he''s about to cum. You quickly get off him and drop down to your knees. You grab him by the dick, pull him toward you and start stroking it.'
+		'You lift one leg and spin yourself around, with his dick still inside of you, until you''re facing the other way. Putting your foot back down, you start riding him in reverse cowgirl style, completely controlling the rhythm and depth. You ride him a bit more before you hear him grunting, telling you he''s about to cum.'
+		'You quickly get off him and drop down to your knees. You grab him by the dick, pull him toward you and start stroking it.'
 		gs 'arousal', 'vaginal', 3, 'dom'
 		gs 'stat'
 		act 'Cum': gt 'gschool_sex', 'petka_titcum'
@@ -1513,14 +1521,15 @@ if $ARGS[0] = 'petka_fuck':
 	gs 'npc_relationship', 'modify', 'A6', 'like'
 	gs 'boyStat', 'A6'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkafuck1.jpg"></center>'
-	'You lie back on the bench and spread your legs wide. "Come over here and fuck me, bitch." He eagerly walks over, nearly tripping over his own feet in his haste. He lines his dick up and slides it into your wet hole. He eagerly thrusts his <<dick>>cm <<$dick_girth>> dick balls deep inside you. You can tell he doesn''t have much experience and isn''t very good, but he is eager.'
+	'You lie back on the bench and spread your legs wide. "Come over here and fuck me, bitch."'
+	'He eagerly walks over, nearly tripping over his own feet in his haste. He lines his dick up and slides it into your wet hole. He eagerly thrusts his <<dick>>cm <<$dick_girth>> dick balls deep inside you. You can tell he doesn''t have much experience and isn''t very good, but he is eager.'
 	gs 'arousal', 'vaginal', 3, 'dom'
 	gs 'stat'
 	act 'Not so fast':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkafuck2.jpg"></center>'
-		'You grab his head and pull him close until he''s looking in your eyes as you tell him "Slow down, this isn''t a race."' 
-		'He looks a little sheepish and slows down a little, but it doesn''t take too long before he starts grunting anyway.'
+		'You grab his head and pull him close until he''s looking in your eyes. "Slow down, this isn''t a race!"' 
+		'He looks a little sheepish and slows down a little, but it doesn''t take long before he starts grunting anyway.'
 		gs 'arousal', 'vaginal', 3, 'dom'
 		gs 'stat'
 		act 'Cum': gt 'gschool_sex', 'petka_titcum'
@@ -1532,13 +1541,15 @@ if $ARGS[0] = 'petka_anal':
 	gs 'npc_relationship', 'modify', 'A6', 'like'
 	gs 'boyStat', 'A6'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaanal1.jpg"></center>'
-	'You walk over to the bench and get down on your hands and knees. Looking over your shoulder at him, you can see him eagerly watching you. "Don''t just stand there. Come over here and fuck my ass!" He looks momentarily surprised but then quickly rushes over, nearly tripping over his own feet in his haste. It takes him a few seconds to line his dick up with your anus, but once he''s sure he has it lined up, he pushes forward until the head of his dick pops into you and slowly starts pumping his <<dick>>cm <<$dick_girth>> dick into your ass.'
+	'You walk over to the bench and get down on your hands and knees. Looking over your shoulder at him, you can see him eagerly watching you. "Don''t just stand there. Come over here and fuck my ass!"'
+	'He looks momentarily surprised but then quickly rushes over, nearly tripping over his own feet in his haste. It takes him a few seconds to line his dick up with your anus, but once he''s sure he has it lined up, he pushes forward until the head of his dick pops into you and slowly starts pumping his <<dick>>cm <<$dick_girth>> dick into your ass.'
 	gs 'arousal', 'anal', 2, 'dom', 'lube'
 	gs 'stat'
 	act 'Reverse cowgirl':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaanal2.jpg"></center>'
-		'The mixture of pleasure and pain is intoxicating. Pain soon starts to give way to just pleasure as he reams your asshole with his cock. He starts moaning loudly and hammering away faster and faster and you can tell he''s on the verge of cumming. You pull away and he tries to follow, but you pull away fast enough that his dick slides out of your hole and you get down on your knees and start stroking him with your hand.'
+		'The mixture of pleasure and pain is intoxicating. Pain soon starts to give way to just pleasure as he reams your asshole with his cock. He starts moaning loudly and hammering away faster and faster and you can tell he''s on the verge of cumming.'
+		'You pull away and he tries to follow, but you pull away fast enough that his dick slides out of your hole and you get down on your knees and start stroking him with your hand.'
 		gs 'arousal', 'anal', 2, 'dom', 'lube'
 		gs 'stat'
 		act 'Cum': gt 'gschool_sex', 'petka_titcum'
@@ -1549,8 +1560,10 @@ if $ARGS[0] = 'petka_titcum':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka4.jpg"></center>'
-	'You start stroking his cock faster and faster and cum is soon squirting out. The hot streams of cum splatter against your breasts, coating them. Once the last spurt hits your chest, he sighs. "Wow! You''re amazing <<$pcs_nickname>>!"'
-	'You get up. "I know. Now what am I going to do with you now?" He visibly swallows, obviously having thought you were going to just let him go.'
+	'You start stroking his cock faster and faster and cum is soon squirting out. The hot streams of cum splatter against your breasts, coating them.'
+	'Once the last spurt hits your chest, he sighs. "Wow! You''re amazing, <<$pcs_nickname>>!"'
+	'You get up. "I know. Now what am I going to do with you now?"'
+	'He visibly swallows, obviously having thought you were going to just let him go.'
 	gs 'arousal', 'hj', 2
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1562,14 +1575,15 @@ end
 if $ARGS[0] = 'petka_homework':
 	*clr & cla
 	menu_off = 1
-!!homework will be auto done each day as Petka does as he promises and leaves Svetas homework in her locker each day
+	!! Homework will be auto done each day as Petka does as he promises and leaves Svetas homework in her locker each day
 	petka['homework'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka4.jpg"></center>'
 	'You smile at him. "You''re going to do my homework for <i>all</i> my classes from now on. You can drop it off in my locker every morning before school."'
 	'He looks crestfallen. "All of it? Every day?" he says in a whiny voice.'
 	'You give him a hard stare. "It''s either that or I get the coach right now."'
 	'He pales and nods. "Okay, okay. I''ll do all of your homework. Can I leave now?"'
-	'You make him squirm before nodding. "Yeah. Now get out of here, you little pervert!" He quickly gets dressed and runs out of the locker room. With that taken care of, you go back to getting dressed.'
+	'You make him squirm before nodding. "Yeah. Now get out of here, you little pervert!"'
+	'He quickly gets dressed and runs out of the locker room. With that taken care of, you go back to getting dressed.'
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1583,7 +1597,8 @@ if $ARGS[0] = 'petka_home':
 	'You cover up. "Get out of here before I shout the coach!"'
 	'He nods and quickly starts getting dressed. "Thank you! And I''m sorry I spied on you."'
 	'You shake your head. "Get the fuck out of here before I change my mind!"'
-	'He turns and takes off towards the door, half-dressed. Just before he makes it out, you call out to him. "Consider this a lesson to not sneak into the girls locker room!" He doesn''t reply and just runs out.'
+	'He turns and takes off towards the door, half-dressed. Just before he makes it out, you call out to him. "Consider this a lesson to not sneak into the girls locker room!"'
+	'He doesn''t reply and just runs out.'
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1597,7 +1612,8 @@ if $ARGS[0] = 'petka_homenaked':
 	'You walk away from him with his clothes. "Well, what are you waiting for? Fuck off!"'
 	'He turns pale. "You want me to go home naked?"'
 	'You nod. "It''s either that or I get the coach and tell him what you were doing, you dirty pervert."'
-	'He just nods and takes off naked towards the door. Just before he makes it out, you call out to him. "Consider this a lesson! I better not see you in here again." He doesn''t reply and just runs out naked. You throw his clothes in the trash and go back to getting dressed.'
+	'He just nods and takes off naked towards the door. Just before he makes it out, you call out to him. "Consider this a lesson! I better not see you in here again!"'
+	'He doesn''t reply and just runs out naked. You throw his clothes in the trash and go back to getting dressed.'
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1612,9 +1628,10 @@ if $ARGS[0] = 'petka_homework_magic':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka4.jpg"></center>'
 	'You smile at him. "You''re going to do my homework for <i>all</i> my classes from now on. You can drop it off in my locker every morning before school."'
 	'He looks crestfallen. "All of it? Every day? But I just let you fuck me in the ass." he says in a whiny voice.'
-	'You give him a hard stare. "Let me? Let me! You loved it, you were moaning like a slut while I fucked your ass, how about I just tell everyone in school about this then?"'
+	'You give him a hard stare. "Let me? You loved it! You were moaning like a slut as I fucked your ass! How about I just tell everyone that?"'
 	'He pales and nods. "Okay, okay. I''ll do all of your homework. Can I leave now?"'
-	'You make him squirm before nodding. "Yeah. Now get out of here, you little pervert!" He quickly gets dressed and runs out of the locker room. With that taken care of, you go back to getting dressed.'
+	'You make him squirm before nodding. "Yeah. Now get out of here, you little pervert!"'
+	'He quickly gets dressed and runs out of the locker room. With that taken care of, you go back to getting dressed.'
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1627,9 +1644,10 @@ if $ARGS[0] = 'petka_homenaked_magic':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka4.jpg"></center>'
 	'You walk away from him with his clothes. "Well, what are you waiting for? Fuck off!"'
 	'He turns pale. "You want me to go home naked? But I let you fuck me in the ass already."'
-	'You give him a hard stare. "Let me? Let me! You loved it, you were moaning like a slut while I fucked your ass, how about I just tell everyone in school about this then?"'
+	'You give him a hard stare. "Let me? You loved it! You were moaning like a slut as I fucked your ass! How about I just tell everyone that?"'
 	'He pales and nods. "Okay, okay. I''ll run home like this."'
-	'He turns bright red and takes off naked towards the door. Just before he makes it out, you call out to him. "Consider this a lesson! I better not see you in here again." He doesn''t reply and just runs out naked. You throw his clothes in the trash and go back to getting dressed.'
+	'He turns bright red and takes off naked towards the door. Just before he makes it out, you call out to him. "Consider this a lesson! I better not see you in here again!"'
+	'He doesn''t reply and just runs out naked. You throw his clothes in the trash and go back to getting dressed.'
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1640,10 +1658,10 @@ if $ARGS[0] = 'albina_lockerroom':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/fingered.jpg"></center>'
-	'Her hand slides between your legs and you part them slightly to allow it between your thighs. She softly rubs your clit before you feel one of her fingers slide inside you. She starts fingerbanging you while squeezing your breast with her other hand and occasionally nuzzling your neck before she pulls her finger out of you and drags you over to the bench. She sits on the bench and spreads her legs wide. "Eat my pussy," she commands. You can tell by her tone of voice that she isn''t asking.'
+	'You part your legs slightly to allow her hand between between your thighs. She softly rubs your clit before you feel one of her fingers slide inside you. She starts fingerbanging you while squeezing your breast with her other hand and occasionally nuzzling your neck before she pulls her finger out of you and drags you over to the bench. She sits on the bench and spreads her legs wide. "Eat my pussy," she commands. You can tell by her tone of voice that she isn''t asking.'
 	gs 'arousal', 'foreplay', 2, 'sub'
 	gs 'arousal', 'vaginal_finger', 2, 'sub'
-	minut -=2
+	minut -= 2
 	gs 'stat'
 	act 'Eat her out':
 		*clr & cla
@@ -1674,7 +1692,8 @@ if $ARGS[0] = 'albina_lockerroom':
 						gs 'npc_relationship', 'modify', 'A23', 'like'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles5.jpg"></center>'
-						'You spread her ass cheeks and start licking her twitching asshole, getting it nice and wet as you listen to her moaning loudly. She seems to really be enjoying this and her hand forces your face between her cheeks. "Oh fuck! Stick your tongue in my ass!" she blurts out between her moans of pleasure. You stiffen your tongue and push it against her asshole. It soon slides in and you start tongue fucking her back door as she rocks back against your face, trying to take your tongue deeper. A few minutes later, she pulls away and turns around, making out with you before she smiles. "Get on your back. I want to sit on your face."'
+						'You spread her ass cheeks and start licking her twitching asshole, getting it nice and wet as you listen to her moaning loudly. She seems to really be enjoying this and her hand forces your face between her cheeks. "Oh fuck! Stick your tongue in my ass!" she blurts out between her moans of pleasure.'
+						'You stiffen your tongue and push it against her asshole. It soon slides in and you start tongue fucking her back door as she rocks back against your face, trying to take your tongue deeper. A few minutes later, she pulls away and turns around, making out with you before she smiles. "Get on your back. I want to sit on your face."'
 						gs 'arousal', 'rimming', 3
 						gs 'stat'
 						act 'Lie back': gt 'gschool_sex', 'albina_lockerroom69'

+ 2 - 2
locations/intro_initialization.qsrc

@@ -547,9 +547,9 @@ else
 		!!Dancer gets leotard
 		danilovich_outfits[155] = 1
 		danilovich_outfits_h[155] = 100
-		danilovich_shoe[6] = 1
+		danilovich_shoe[18] = 1
 		danilovich_shoe[21] = 0
-		sportsshoenumber = 6
+		sportsshoenumber = 18
 	elseif $start_type['group'] = 'gopnik':
 		gm_school[52] = 1
 		gm_school_h[52] = 120

+ 30 - 3
locations/intro_sg_select.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 	gs 'homes_properties', 'set_home', 'parents_home'
 	killvar 'class_list_institution'
 	killvar 'class_list_name'
-	
+
 	gs 'intro_functions', 'create_sgclasses'
 	gs 'intro_functions', 'set_base_sgrades'	& ! Set everything at 55
 
@@ -93,9 +93,12 @@ if $ARGS[0] = 'SGStart2':
 		cls
 		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_3.jpg"></center>'
 		*nl
-		'You have two options when it comes to beginning your game:'
+		'You have four options when it comes to beginning your game:'
 		*nl
-		'Starting in August, at the end of the summer holiday, very close to the new school year <i>(recommended for new players)</i>, or starting in June, at the beginning of the summer holiday.'
+		'1. Starting in August, at the end of the summer holiday, very close to the new school year <i>(recommended for new players)</i>'
+		'2. Starting at August 1st, a month before the start of the new school year.'
+		'3. Starting at July 1st, one month into the summer holiday'
+		'4. Starting at June 1st, at the beginning of the summer holiday.'
 		!!This is to account for the school year not matching up with the calendar year.
 		!if date_toggle ! 1:
 		!	if birthmonth >= 7: birthyear -= 1
@@ -118,6 +121,30 @@ if $ARGS[0] = 'SGStart2':
 			gt 'intro_sg_select', 'SGStart3'
 		end
 
+		act 'Start at the beginning of August':
+			month = 8
+			$month = 'August'
+			grandmaQW['last_month_paid'] = month
+			day = 1
+			week = 1
+			kanicont = 31
+			Gspassed = 1
+			locat['Fam_set_month_inGad'] = 1
+			gt 'intro_sg_select', 'SGStart3'
+		end
+
+		act 'Start at the beginning of July':
+			month = 7
+			$month = 'July'
+			grandmaQW['last_month_paid'] = month
+			day = 1
+			week = 5
+			kanicont = 62
+			Gspassed = 1
+			locat['Fam_set_month_inGad'] = 1
+			gt 'intro_sg_select', 'SGStart3'
+		end
+
 		act 'Start at the beginning of June':
 			month = 6
 			$month = 'June'

+ 28 - 4
locations/intro_sg_tg.qsrc

@@ -247,7 +247,7 @@ if $ARGS[0] = 'settings':
 	gs 'intro_functions', 'create_sgclasses'
 	gs 'intro_functions', 'set_base_sgrades'
 
-	
+
 	gt 'intro_sg_tg', 'intro_6_looks'
 end
 
@@ -267,7 +267,7 @@ if $ARGS[0] = 'intro_6_looks':
 	'<center>Customize your:</center>'
 	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
 
-	
+
 	act 'Meet her': gt 'intro_sg_tg', 'intro_7'
 	act 'Customise <<$pcs_firstname>>': gt 'intro_customization', 'start'
 end
@@ -276,7 +276,7 @@ end
 if $ARGS[0] = 'intro_7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	'You couldn''t tell from her photo, but although shorter than you, she is rather tall for a girl.' 
+	'You couldn''t tell from her photo, but although shorter than you, she is rather tall for a girl.'
 	'She looks like she''s spent some time in front of the mirror trying to pretty herself up, and her clothes are very clean. Despite that, she still looks rather average. Like she is the type of girl that would be a background character in another person''s life.'
 
 	act 'Go for a walk':
@@ -426,7 +426,7 @@ if $ARGS[0] = 'intro_9':
 	bcolor = rgb (0,0,0)
 	lcolor = rgb (106, 90, 205)
 	fcolor = rgb (255, 255, 255)
-	
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/11.jpg"></center>'
 	'<center>...</center>'
 	wait 1500
@@ -562,6 +562,30 @@ if $ARGS[0] = 'intro_9':
 																	gt 'intro_sg_tg', 'intro_end'
 																end
 
+																act 'Start at the beginning of August':
+																	month = 8
+																	$month = 'August'
+																	grandmaQW['last_month_paid'] = month
+																	day = 1
+																	week = 1
+																	kanicont = 31
+																	Gspassed = 1
+																	locat['Fam_set_month_inGad'] = 1
+																	gt 'intro_sg_tg', 'intro_end'
+																end
+
+																act 'Start at the beginning of July':
+																	month = 7
+																	$month = 'July'
+																	grandmaQW['last_month_paid'] = month
+																	day = 1
+																	week = 5
+																	kanicont = 62
+																	Gspassed = 1
+																	locat['Fam_set_month_inGad'] = 1
+																	gt 'intro_sg_tg', 'intro_end'
+																end
+
 																act 'Start at the beginning of June':
 																	month = 6
 																	$month = 'June'

+ 2 - 2
locations/pav_commcenter.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] ! 'XXX':
 	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 
 	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
-	
+
 	act 'Check the noticeboard': gs 'noticeboard','start'
 
 	if nerd_game['game_day'] = daystart and hour = 19 and yearstart = 1: act 'Wait for game night to start': minut += 60-minut & gt 'nerd_game_night', 'game'
@@ -67,7 +67,7 @@ if $ARGS[0] ! 'XXX':
 	gs 'core_library', 'init'
 
 	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
-	
+
 	act 'Wait': gs 'obj_din', 'wait'
 
 	if locat['Anya'] = 10: 'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'

+ 8 - 8
locations/pav_residential.qsrc

@@ -42,7 +42,7 @@ else
 	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>' 
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>'
 	end
 end
 
@@ -74,7 +74,7 @@ elseif rape > rape_count:
 	end
 end
 
-!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ---- 
+!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ----
 !!if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
 !!	pav_residential_prost_day = daystart
 !!	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
@@ -118,7 +118,7 @@ if mid($start_type,1,2) = 'sg':
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
 else
 	$schoolname = 'your old school.'
-end	
+end
 
 '<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for local teenagers to hang out after a long day at <<$schoolname>> Also nearby is the drab grey building of Pavlovsk''s dilapidated public <a href="exec: gt ''pav_pool'',''building''">swimming pool</a>. Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
 
@@ -145,7 +145,7 @@ else
 end
 !!end of code changes.
 
-if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: 
+if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9:
 	act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 end
 
@@ -155,12 +155,12 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
 act 'Walk to the Five Eight estate (0:02)': minut += 2 & gt 'pav_complex', 'start'
 act 'Walk to the Commercial area (0:05)': minut += 5 & gt 'pav_commercial'
 act 'Walk to the Industrial region (0:05)': minut += 5 & gt 'pav_industrial'
 act 'Walk to the Market (0:15)': minut += 15 & gt 'pav_market'
 act 'Walk to the park (0:05)': minut += 5 & gt 'pav_park', 'start'
+act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
 act 'Walk to the train station (0:15)': minut += 15 & gt 'pav_train_hall'
 act 'Walk to Pushkin (0:30)': minut += 30 & gt 'pushkin'
 
@@ -269,7 +269,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Bely''s Mitsubishi Pajero stops near you.'
-	act 'Go to the jeep': gt 'belgang', 'payday' 	
+	act 'Go to the jeep': gt 'belgang', 'payday'
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
 	cla & *clr
@@ -278,10 +278,10 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang inside. Your heart skips a beat as you notice one of them pointing at you and they pull over.'
-	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
+	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 gs 'prostitution_functions', 'check_solicitation_event'
 
 gs 'booty_call', 'home_links'

+ 3 - 3
locations/pav_train_hall.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	*nl
-	
+
 	*nl
 	if rand(0,2) = 0 and week < 5 and hour >= 8 and hour < 18:
 !!a 1 in 3 chances at those times he is here
@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	
+
 	act 'Walk to the Market (0:03)': minut += 3 & gt 'pav_market'
 	act 'Walk to the Commercial area (0:10)': minut += 10 & gt 'pav_commercial'
 	act 'Walk to the Residential area (0:15)': minut += 15 & gt 'pav_residential'
@@ -116,7 +116,7 @@ if $ARGS[0] = '':
 
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
-	
+
 		if mc_inventory['trinkets_home'] > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 	end
 

+ 10 - 6
locations/stat_display.qsrc

@@ -1268,13 +1268,17 @@ if cheatStatusIcons = 0:
 		end
 	end
 
-	if mc_inventory['makeup_wipes'] > 0:
-		if stat_cumloc_check = 1 and menu_off = 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 stat_cumloc_check = 1 and menu_off = 1:
+	if mc_inventory['makeup_wipes'] > 0 and $stat_cum_msg ! '' and $stat_cum_msg ! 'Your mouth has the tangy aftertaste of sperm.':
+		if menu_off = 1:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-		elseif stat_cumloc_check = 2:
-			$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>'
+		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) : 
+				$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>'
+			end
 		end
 	end
 

+ 7 - 8
locations/therapist_home.qsrc

@@ -27,13 +27,12 @@ if $ARGS[0] = 'hotel_enter':
 end
 
 if $ARGS[0] = 'set_Hotelacts':
-	if hour > 22 and hour < 6:
+	if hour >= 6 and hour <= 22:
 		if university['student'] = 1: act 'Study(1:00)': gt 'therapist_home', 'study'
-	else
 		act 'Play on your laptop': gt 'komp','start'
-		if locat['A186'] = 2: act 'Make love to you Husband': gt 'therapist_home', 'sex'
-		act 'Relax (1:00)': gt 'therapist_home', 'relax'
+		if locat['A186'] = 2 and hour => 21: act 'Make love to you Husband': gt 'therapist_home', 'sex'
 	end
+	act 'Relax (1:00)': gt 'therapist_home', 'relax'
 end
 
 if $ARGS[0] = 'relax':
@@ -152,7 +151,7 @@ elseif $ARGS[0] = 'wakeup':
 
 elseif $ARGS[0] = 'wakeup1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
-	'You wake up in the morning and scoot off the bed.' 
+	'You wake up in the morning and scoot off the bed.'
 	'You move and stretch to remove the stiffness of sleep.'
 	'You feel your husband''s cum leak out of you as you make your way to the kitchen area and make your husband some eggs and bacon before you go clean up and start your day.'
 
@@ -185,7 +184,7 @@ if $ARGS[0] = 'sex':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex2.jpg"></center>'
-			'Its not long before he''s making love to you, moaning your name all the while fondling you.' 
+			'Its not long before he''s making love to you, moaning your name all the while fondling you.'
 
 			act 'Continue':
 				*clr & cla
@@ -251,7 +250,7 @@ if $ARGS[0] = 'first_morning':
 	pcs_hydra = 100
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
-	'You wake up and see your husband already awake and working on something on his laptop. "Good Morning, Dear. How about you make us some breakfast?" he says and you slide out of bed and move over to the kitchenette and start to make him breakfast. While you hand him his plate of food, you hear a snap and you go blank.' 
+	'You wake up and see your husband already awake and working on something on his laptop. "Good Morning, Dear. How about you make us some breakfast?" he says and you slide out of bed and move over to the kitchenette and start to make him breakfast. While you hand him his plate of food, you hear a snap and you go blank.'
 	'"My Wife, every morning you will wake up and make breakfast for Me and our children. I can handle lunch on my own, dinner too, but when we move to a larger place, you will be responsible for dinner too, Understand?" he says and you say in a monotone voice "Yes, Sir"'
 	'The snap is heard again and you blink for a moment. "You ok, wife?" he asks'
 	'You nod. "Yes, just drifted off" you reply'
@@ -260,7 +259,7 @@ if $ARGS[0] = 'first_morning':
 	act 'Take a Shower':
 		*clr & cla
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/therapist/hotel_shower1.mp4"></video></center>'
-		noshampoo = 1 
+		noshampoo = 1
 		dynamic $showerdin
 		'You stand in the shower and let the water pour over you. You think about your life.'
 		'You are still a teenager and now you are married. You can''t recall how it all happened but you feel a bit worried but also happy. As if it''s just first-time jitters.'

+ 1 - 1
locations/tour_guide.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'tourstart':
 	menu_off = 1
 	cla & *clr
 	!! TourGuide = 0
-	if emp_job_status[1] = 0  or emp_job_status[1] =4:
+	if emp_job_status[1] = 0 or emp_job_status[1] = 4:
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/tour_office.jpg"></center>'

+ 12 - 16
locations/uni_lessons_electives1.qsrc

@@ -235,7 +235,7 @@ if $ARGS[0] = 'art_101_model':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 4)
+		temprand = rand(0,4)
 		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'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.'
@@ -247,7 +247,7 @@ if $ARGS[0] = 'art_101_model':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(0, 5)
+		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.' 
@@ -266,8 +266,7 @@ if $ARGS[0] = 'art_101_model':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
+			'<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. "Today, we have one of your fellow students as a model. 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, something that somewhat flusters Mr. Ilyushin before he 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.'
@@ -281,7 +280,7 @@ if $ARGS[0] = 'art_101_model_igor':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 4)
+		temprand = rand(0,4)
 		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'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.'
@@ -291,7 +290,7 @@ if $ARGS[0] = 'art_101_model_igor':
 			'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)
+		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.' 
@@ -314,8 +313,7 @@ if $ARGS[0] = 'art_101_model_igor':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
+			'<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. "Today, we have one of your fellow students as a model. 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, something that somewhat flusters Mr. Ilyushin before he 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. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her toned physique. The class goes by fairly quickly.'
@@ -329,7 +327,7 @@ if $ARGS[0] = 'art_101_model_feofan':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 4)
+		temprand = rand(0,4)
 		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'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. Feofan seems semi bored with the class and keeps doodling instead of listening, but the lecture goes by fairly quickly.'
@@ -340,7 +338,7 @@ if $ARGS[0] = 'art_101_model_feofan':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(0, 5)
+		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.' 
@@ -359,8 +357,7 @@ if $ARGS[0] = 'art_101_model_feofan':
 			'"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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
+			'<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.' 
 			'"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.'
@@ -375,7 +372,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 4)
+		temprand = rand(0,4)
 		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'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.'
@@ -388,7 +385,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(0, 5)
+		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.'
@@ -408,8 +405,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
+			'<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. "Today, we have one of your fellow students as a model. 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, something that somewhat flusters Mr. Ilyushin before he 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.'

+ 15 - 23
locations/uni_lessons_electives2.qsrc

@@ -235,7 +235,7 @@ if $ARGS[0] = 'art_102_model':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 5)
+		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.' 
@@ -253,15 +253,14 @@ if $ARGS[0] = 'art_102_model':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming a pose that causes Mr. Ilyushin to nod in approval before 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. As you''re drawing Albina, you overhear a few of your male classmates talking about how much they want to draw her naked. The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(0, 5)
+		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.' 
@@ -279,8 +278,7 @@ if $ARGS[0] = 'art_102_model':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
+			'<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.'
 			'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 Albina, you overhear a few of your male classmates talking about how they would love to bang her, with one claiming that he already has. The class goes by fairly quickly.'
@@ -294,7 +292,7 @@ if $ARGS[0] = 'art_102_model_igor':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 5)
+		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.' 
@@ -313,15 +311,14 @@ if $ARGS[0] = 'art_102_model_igor':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before 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. As you''re drawing Albina, you overhear a few of your male classmates talking about how much they want to draw her naked. Igor, meanwhile, seems very intent on trying to properly detail the way she ruffles her hair. The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(0, 5)
+		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.' 
@@ -339,8 +336,7 @@ if $ARGS[0] = 'art_102_model_igor':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
+			'<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.'
 			'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 Albina, you overhear a few of your male classmates talking about how they would love to bang her, with one claiming that he already has. Igor, meanwhile, seems very intent on trying to capture her feminine form, paying special attention to her rather alluring pose. The class goes by fairly quickly.'
@@ -354,7 +350,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 5)
+		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.' 
@@ -374,8 +370,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before 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 Albina, you overhear a few of your male classmates talking about how much they want to draw her naked. Glancing over at Feofan, you notice that he seems to be struggling to put pencil to paper and needs Mr. Ilyushin''s assistance to get started.'
@@ -401,8 +396,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 			'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.' 
 		elseif temprand = 5:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
+			'<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.'
 			'Feofan is sitting directly in front of her and has a view of everything she''s showing off. You see him getting rather flustered and avoiding eye contact as he subtly tries to hide the obvious bulge in his pants, but Albina notices this and grins slightly.'
 			'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 Albina, you overhear a few of your male classmates talking about how they would love to bang her, with one claiming that he already has. The class goes by fairly quickly.'
@@ -416,7 +410,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(0, 5)
+		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.' 
@@ -435,15 +429,14 @@ if $ARGS[0] = 'art_102_model_natasha':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before 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. As you''re drawing Albina, you overhear a few of your male classmates talking about how much they want to draw her naked. When you glance over at Natasha, you see that she''s clearly uncomfortable with Albina''s choice of attire and blushes heavily. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(0, 5)
+		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.' 
@@ -463,8 +456,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 			'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:
-				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
+			'<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.'
 			'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 Albina, you overhear a few of your male classmates talking about how they would love to bang her, with one claiming that he already has.'
 			'You look over at Natasha and notice her blushing not only at Albina''s lack of clothing, but her alluring pose. She struggles initially, requiring Mr. Ilyushin to spend some time with her, but she soon overcomes her embarrassment and completes the lesson without any further assistance. The class goes by fairly quickly.'

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů