Parcourir la source

Merge remote-tracking branch 'Kevin_Smarts/master'

netuttki il y a 2 mois
Parent
commit
ee68473435
100 fichiers modifiés avec 443 ajouts et 440 suppressions
  1. 1 0
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/LariskaHome.qsrc
  3. 1 1
      locations/Serge_Shulgin.qsrc
  4. 1 1
      locations/Serge_kuh.qsrc
  5. 2 2
      locations/Terminal.qsrc
  6. 2 2
      locations/TerminalOffice.qsrc
  7. 1 1
      locations/Vika.qsrc
  8. 1 1
      locations/VolleyTrenCentr.qsrc
  9. 1 1
      locations/WorkHosp.qsrc
  10. 6 6
      locations/alarmclock.qsrc
  11. 3 3
      locations/albina_starlets.qsrc
  12. 5 5
      locations/andrey.qsrc
  13. 5 5
      locations/anushka_konstantinov_schedule.qsrc
  14. 1 1
      locations/arkadi_fyodorov_schedule.qsrc
  15. 2 2
      locations/bdsm_mansion.qsrc
  16. 1 1
      locations/bedrPar.qsrc
  17. 18 9
      locations/blackmailer.qsrc
  18. 2 2
      locations/booty_call.qsrc
  19. 3 3
      locations/buklinik.qsrc
  20. 1 1
      locations/burger.qsrc
  21. 2 2
      locations/casting.qsrc
  22. 2 2
      locations/cikl.qsrc
  23. 23 23
      locations/city_center.qsrc
  24. 3 3
      locations/city_church.qsrc
  25. 3 3
      locations/city_clinic.qsrc
  26. 1 1
      locations/city_coffee_hole.qsrc
  27. 1 1
      locations/city_commcenter.qsrc
  28. 9 9
      locations/city_industrial.qsrc
  29. 5 5
      locations/city_island.qsrc
  30. 2 2
      locations/city_kafe.qsrc
  31. 1 1
      locations/city_lake.qsrc
  32. 2 2
      locations/city_market.qsrc
  33. 1 1
      locations/city_nightclub.qsrc
  34. 2 2
      locations/city_park.qsrc
  35. 5 5
      locations/city_redlight.qsrc
  36. 5 5
      locations/city_residential.qsrc
  37. 1 1
      locations/city_saunawhore.qsrc
  38. 2 2
      locations/city_smalloffice.qsrc
  39. 2 2
      locations/courtletter.qsrc
  40. 3 3
      locations/emp_job_array.qsrc
  41. 1 1
      locations/etoexhib.qsrc
  42. 10 10
      locations/foto_events.qsrc
  43. 2 2
      locations/gad_church.qsrc
  44. 1 1
      locations/gad_gpbarn.qsrc
  45. 3 3
      locations/gad_gpbath.qsrc
  46. 2 2
      locations/gadukino.qsrc
  47. 3 3
      locations/gdksport.qsrc
  48. 1 1
      locations/gkafe.qsrc
  49. 2 2
      locations/gschool_cheerleading.qsrc
  50. 1 1
      locations/gschool_grounds.qsrc
  51. 3 3
      locations/gschool_lessons4.qsrc
  52. 1 1
      locations/gschool_socialchg.qsrc
  53. 1 1
      locations/havana.qsrc
  54. 1 1
      locations/hotel_anna.qsrc
  55. 5 5
      locations/intro_sg.qsrc
  56. 2 2
      locations/journal.qsrc
  57. 5 5
      locations/journal_quests.qsrc
  58. 23 23
      locations/journal_work.qsrc
  59. 1 1
      locations/kotovdom.qsrc
  60. 1 1
      locations/kseniyaQW.qsrc
  61. 10 10
      locations/lakecafe.qsrc
  62. 3 3
      locations/leonid.qsrc
  63. 84 84
      locations/masseuse_schedule.qsrc
  64. 2 2
      locations/mey_tamara_events.qsrc
  65. 22 29
      locations/miroslava_schedule.qsrc
  66. 1 1
      locations/music_checks.qsrc
  67. 2 2
      locations/music_delparco.qsrc
  68. 6 6
      locations/natbel_chat.qsrc
  69. 10 10
      locations/nerd_game_night.qsrc
  70. 1 1
      locations/nichBedroomServant.qsrc
  71. 3 3
      locations/nichLivingroom.qsrc
  72. 5 5
      locations/nyp_school.qsrc
  73. 1 1
      locations/office.qsrc
  74. 4 4
      locations/pav_church.qsrc
  75. 4 4
      locations/pav_clinic.qsrc
  76. 4 4
      locations/pav_commcenter.qsrc
  77. 5 5
      locations/pav_commercial.qsrc
  78. 6 6
      locations/pav_factory.qsrc
  79. 2 2
      locations/pav_hotelAdmin.qsrc
  80. 1 1
      locations/pav_hotelReception.qsrc
  81. 1 1
      locations/pav_hotelWork.qsrc
  82. 4 4
      locations/pav_industrial.qsrc
  83. 1 1
      locations/pav_pool.qsrc
  84. 1 1
      locations/pav_shared_apt.qsrc
  85. 8 8
      locations/pav_train_hall.qsrc
  86. 3 3
      locations/pav_train_hall_events.qsrc
  87. 1 1
      locations/pav_train_market.qsrc
  88. 2 2
      locations/pirsingsalon.qsrc
  89. 2 2
      locations/pornstudio.qsrc
  90. 10 10
      locations/post_deliveries.qsrc
  91. 15 15
      locations/post_master.qsrc
  92. 1 1
      locations/post_office.qsrc
  93. 1 1
      locations/praiders_garage_chat.qsrc
  94. 1 1
      locations/pushkin_ballet_class.qsrc
  95. 2 2
      locations/pushkin_ballet_evt.qsrc
  96. 2 2
      locations/pushkin_ballet_init.qsrc
  97. 2 2
      locations/pushkin_ballet_res.qsrc
  98. 1 1
      locations/pushkin_ballet_secrets.qsrc
  99. 6 6
      locations/pushkin_sq.qsrc
  100. 1 1
      locations/radomir_popov_schedule.qsrc

+ 1 - 0
locations/Cheatmenu_din.qsrc

@@ -56,6 +56,7 @@ if $ARGS[0] = 'setting':
 	'Peeing: <a href="exec:										cheatVars[''pee'']					= iif(cheatVars[''pee''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''pee'']					, ''Disabled'', ''Enabled'')>></a>'
 	*nl
 	'Renaming porn movies you star in: <a href="exec:			cheatVars[''rename_porn'']			= iif(cheatVars[''rename_porn''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''rename_porn'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Time format: <a href="exec: 								cheatVars[''time_format''] 			= iif(cheatVars[''time_format''], 0, 1) 		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''time_format'']			, ''12 Hour'', ''24 Hour'')>></a>'
 	'Remove "once a week" therapist limit: <a href="exec:		cheatVars[''therapist_schedule'']	= iif(cheatVars[''therapist_schedule''], 0, 1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''therapist_schedule'']	, ''Enabled'', ''Disabled'')>></a>'
 	*nl
 

+ 1 - 1
locations/LariskaHome.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'front_door':
 		elseif locat['Lariska'] = 21:
 			$text_home = 'Lariska is at the volleyball game.'
 		elseif locat['Lariska'] = 1:
-			$text_home = 'Lariska is asleep right now. She should be up around 9am.'
+			$text_home = 'Lariska is asleep right now. She should be up around '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.'
 		elseif locat['Lariska'] = 13:
 			$text_home = 'Lariska is unable to answer the door right now.'
 		elseif locat['Lariska'] = 15:

+ 1 - 1
locations/Serge_Shulgin.qsrc

@@ -559,7 +559,7 @@ if $ARGS[0] = 'hide':
 		serge_textb = rand(0,6)
 		if serge_textb = 0:$serge_textb = 'When you ask about Vasily''s mother, Sergey shrugs: "It''s a short story, really. I met Vasily''s mother at my graduation party. We all got drunk and she and I had some fun. When she turned out to be pregnant, we got married. We didn''t have much of a say in the matter, that''s just how it worked back then. Shulga was born a few months after that. We tried to make it work, but she got bored and left me a year later when she got offered a job abroad, leaving Shulga with me. I haven''t heard from her since. It''s fine, though... me and him managed just fine, without her."'
 		if serge_textb = 1:$serge_textb = 'You spend fifteen minutes talking to Sergey about everyday things.'
-		if serge_textb = 2:$serge_textb = 'When you ask Sergey what he does for a living, he smiles and says: "I work in a factory where we produce bricks. I work the day shift, from 09:00 to 15:00, five days a week. I''m a foreman there, managing the laborers and keeping an eye on the machinery. Of course I pitch in as well, when the men need help. It''s dusty, hard work, and it doesn''t pay well, but it''s work worth doing!"'
+		if serge_textb = 2:$serge_textb = 'When you ask Sergey what he does for a living, he smiles and says: "I work in a factory where we produce bricks. I work the day shift, from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+', five days a week. I''m a foreman there, managing the laborers and keeping an eye on the machinery. Of course I pitch in as well, when the men need help. It''s dusty, hard work, and it doesn''t pay well, but it''s work worth doing!"'
 		if serge_textb = 3:$serge_textb = 'When you ask about his relationship with his son, Sergey shrugs and says in a tired voice: "Eh. We do okay, given the circumstances. He''s... changed, though. He''s rather difficult to handle nowadays. For the last year or so, he has shown no interest in school and he stays out until late every day, doing God knows what. I''m just not sure how to get through to him any more."'
 		if serge_textb = 4:$serge_textb = 'Sergey tells you a funny story.'
 		if serge_textb = 5:$serge_textb = 'Sergey is actually a pretty smart guy, and you listen to him for fifteen minutes while he tells you anecdotes about his past.'

+ 1 - 1
locations/Serge_kuh.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = '':
 		serge_textbk = rand(0,4)
 		if serge_textbk = 0:$serge_textbk = 'When you ask about Vasily''s mother, Sergey shrugs: "It''s a short story, really. I met Vasily''s mother at my graduation party. We all got drunk and she and I had some fun. When she turned out to be pregnant, we got married. We didn''t have much of a say in the matter, that''s just how it worked back then. Shulga was born a few months after that. We tried to make it work, but she got bored and left me a year later when she got offered a job abroad, leaving Shulga with me. I haven''t heard from her since. It''s fine, though... me and him managed just fine, without her."'
 		if serge_textbk = 1:$serge_textbk = 'You spend fifteen minutes talking to Sergey about everyday things.'
-		if serge_textbk = 2:$serge_textbk = 'When you ask Sergey what he does for a living, he smiles and says: "I work in a factory where we produce bricks. I work the day shift, from 09:00 to 15:00, five days a week. I''m a foreman there, managing the labourers and keeping an eye on the machinery. Of course I pitch in as well, when the men need help. It''s dusty, hard work, and it doesn''t pay well, but it''s work worth doing!"'
+		if serge_textbk = 2:$serge_textbk = 'When you ask Sergey what he does for a living, he smiles and says: "I work in a factory where we produce bricks. I work the day shift, from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+', five days a week. I''m a foreman there, managing the labourers and keeping an eye on the machinery. Of course I pitch in as well, when the men need help. It''s dusty, hard work, and it doesn''t pay well, but it''s work worth doing!"'
 		if serge_textbk = 3:$serge_textbk = 'When you ask about his relationship with his son, Sergey shrugs and says in a tired voice: "Eh. We do okay, given the circumstances. He''s... changed, though. He''s rather difficult to handle nowadays. For the last year or so, he has shown no interest in school and he stays out until late every day, doing God knows what. I''m just not sure how to get through to him any more."'
 		if serge_textbk = 4:$serge_textbk = 'Sergey is actually a pretty smart guy, and you listen to him for fifteen minutes while he tells you stories about his past.'
 

+ 2 - 2
locations/Terminal.qsrc

@@ -104,7 +104,7 @@ if trfatherQW = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/terminal/trfatherqw_3.jpg"></center>'
 			'You go up to the managers office. "Good afternoon! What I can help you?" he says.'
 			'"Hello, I wanted to know, if you know a Mikhail Kuznetsov or if he works here?"'
-			'He turns to his computer and pulls something up. "I''ll check in our database, yes, we have a driver by that name. He is on the road right now and only comes in on Saturday at 12:00."'
+			'He turns to his computer and pulls something up. "I''ll check in our database, yes, we have a driver by that name. He is on the road right now and only comes in on Saturday at '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'."'
 			'"Thank you very much, you helped me a lot."  With that you leaved but now you know when and where to find him.'
 			act 'Leave':minut += 5 & gt 'Terminal'
 		end
@@ -168,7 +168,7 @@ if trfatherQW = 2:
 						'You got out of the truck with sperm all over your face.'
 						'"So, What did you want to know?" The first man asked.'
 						'"I wanted you to know, whether you know a Mikhail Kuznetsov?"'
-						'"Aaa, Micah, Sure, great guy, he is out on a run. He will be back Saturday at 12:00."'
+						'"Aaa, Micah, Sure, great guy, he is out on a run. He will be back Saturday at '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'."'
 						act 'Leave':minut += 5 & gt 'Terminal'
 					end
 				end

+ 2 - 2
locations/TerminalOffice.qsrc

@@ -220,7 +220,7 @@ if $ARGS[0] = '11':
 		!Where the Director, the Door was closed dir
 		act 'Ask about the Director':
 			'"Excuse me, I wonder if I could meet your supervisor?" you ask.'
-			'The Manager grins, "Yuri is usually here every Monday through Friday, between 9:00 and 18:00 except lunch between 13:00 and 14:00."'
+			'The Manager grins, "Yuri is usually here every Monday through Friday, between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' except lunch between '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'."'
 			cla
 			act 'Leave': YouNotOpenDoorDir = 0 & gt 'TerminalOffice', '11'
 		end
@@ -230,7 +230,7 @@ if $ARGS[0] = '11':
 	if YouNotOpenDoorBuh = 1:
 		act 'Ask about the accountant':
 			'"Excuse me, I wonder if I could meet your accountant?" you ask.'
-			'The Manager grins, "Elizabeth is usually here Monday through Friday, between 9:00 and 20:00 except lunch between 13:00 and 14:00."'
+			'The Manager grins, "Elizabeth is usually here Monday through Friday, between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' except lunch between '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'."'
 			cla
 			act 'Leave': YouNotOpenDoorBuh = 0 & gt 'TerminalOffice', '11'
 		end

+ 1 - 1
locations/Vika.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'brothel_questions':
 					odkomp = 0
 
 					'"Do you think you could get me a job at the brothel?" you ask.'
-					'"Well I can ask the manager, but I can''t guarantee anything. Come by' + iif(hour < 20, ' after 20:00', '') + ', and I''ll see what I can do."'
+					'"Well I can ask the manager, but I can''t guarantee anything. Come by' + iif(hour < 20, ' after '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'', '') + ', and I''ll see what I can do."'
 				end
 			end
 		end

+ 1 - 1
locations/VolleyTrenCentr.qsrc

@@ -17,7 +17,7 @@ if ShowerIvan = 4 and centr = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak11.jpg"></center>'
 		'After greeting Mikhail, an awkward silence follows because you don''t know what to say.'
 		'"<<$pcs_nickname>>, what are you doing here?" Mikhail asks you in astonishment.'
-		'"Well, I wanted to improve my physical fitness, and since the sports club doesn''t open until 14:00, I figured it was worth the trip into the city to come here," you explain hastily.'
+		'"Well, I wanted to improve my physical fitness, and since the sports club doesn''t open until '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+', I figured it was worth the trip into the city to come here," you explain hastily.'
 		'The coach looks at you with an approving nod, "That is good, <<$pcs_nickname>>."'
 		'The stranger smiles at you and says, "I am Guang. Your coach and I are old friends from when we used to compete against each other. He represented the people of the Soviet Republics, and I, naturally, represented the people of the Republic of China. After my team beat his so many times, his government finally convinced me to change sides as it were. Now I train the athletes of the Russian Federation, and Mikhail and I meet here from time to time."'
 		'"I am sorry, <<$pcs_nickname>> and Guang, but my wife is expecting me and I must be going," the coach says, looking at his watch. He then departs, leaving you in the company of the Chinese trainer.'

+ 1 - 1
locations/WorkHosp.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'milit':
 	cla
 	military = 1
 	'Kat turns to you. "Listen, I''m scheduled to work this weekend, but I have plans. Here''s the deal: war games are often held not far from the city and, well, according to the rules, they need doctors on site before they can begin.' 
-	'She notices your reaction. "Don''t worry, you''ll have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, you can catch a bus at the clinic on Saturday between 06:00 and 09:00. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?"'
+	'She notices your reaction. "Don''t worry, you''ll have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, you can catch a bus at the clinic on Saturday between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?"'
 
 	act 'Move away': gt 'WorkHosp', 'start'
 end

+ 6 - 6
locations/alarmclock.qsrc

@@ -28,15 +28,15 @@ end
 
 if $ARGS[0] = 'alarm_display':
 	!! func('alarmclock', 'alarm_display', hour, minutes)
-	$result = '<b><<func(''time'', ''get_time_string'', ARGS[1], ARGS[2])>></b>'
+	$result = '<b><<func(''time'', ''get_time_string'',  ARGS[1], ARGS[2], cheatVars[''time_format''])>></b>'
 end
 
 if $ARGS[0] = 'get_week_display':
-	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b>'
+	$result = '<b><<func(''time'', ''get_time_string'',  alarmVars[''timerH''], alarmVars[''timerM''], cheatVars[''time_format''])>></b>'
 end
 
 if $ARGS[0] = 'get_weekend_display':
-	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b>'
+	$result = '<b><<func(''time'', ''get_time_string'',  alarmVars[''timerEndH''], alarmVars[''timerEndM''], cheatVars[''time_format''])>></b>'
 end
 
 if $ARGS[0] = 'base_alarmclock_text':
@@ -222,11 +222,11 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table='<center><table border=0 cellpadding=0 cellspacing=5><font size="+1"<b>'
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Reset''">Reset weekday alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Time''">Set weekday alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b></td></tr>'
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'',  alarmVars[''timerH''],  alarmVars[''timerM''], cheatVars[''time_format''])>></b></td></tr>'
 
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Reset''">Reset weekend alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Time''">Set weekend alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b></td></tr>'
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'',  alarmVars[''timerEndH''],  alarmVars[''timerEndM''], cheatVars[''time_format''])>></b></td></tr>'
 
 	if mid($start_type,1,2) = 'sg':
 		$alarmVars_table+='<tr><td colspan="3"><b>Use weekend alarm for holidays - ' + iif(alarmVars['alarm_holiday'] = 0, '<a href="exec: alarmVars[''alarm_holiday''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec:  alarmVars[''alarm_holiday''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '</b></td></tr>'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table+='<tr><td colspan="3"><b>Your alarm is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '.</b></td></tr>'
 
 	if alarmVars['alarmOn'] = 1:
-		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('time', 'get_time_string', alarmVars['timerH'], alarmVars['timerM'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('time', 'get_time_string', alarmVars['timerEndH'], alarmVars['timerEndM'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
+		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('time', 'get_time_string', alarmVars['timerH'], alarmVars['timerM'], cheatVars['time_format'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('time', 'get_time_string', alarmVars['timerEndH'], alarmVars['timerEndM'], cheatVars['time_format'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
 	end
 	$alarmVars_table+='</b></font></table></center>'
 

+ 3 - 3
locations/albina_starlets.qsrc

@@ -315,10 +315,10 @@ if $ARGS[0] = 'starlets':
 						dynamic $showerdin
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-						if pcs_apprnc >= 52 and (stat['think_virgin'] = 0 or stat['vaginal'] > 0):
-							if pcs_apprnc < 64:
+						if pcs_hotcat >= 6 and (stat['think_virgin'] = 0 or stat['vaginal'] > 0):
+							if pcs_hotcat < 8:
 								AlbinaQW['StarletCustomer'] = rand(1,15)
-							elseif pcs_apprnc < 72:
+							elseif pcs_hotcat < 9:
 								AlbinaQW['StarletCustomer'] = rand(1,12)
 							else
 								AlbinaQW['StarletCustomer'] = rand(1,10)

+ 5 - 5
locations/andrey.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'apply':
 		*nl
 		'He barely glances your way as he shuffles some papers around. "Oh yeah I forgot about that... well, the job is still open. I need an extra worker around the store, and it needs to be a girl... a young girl," he says before suddenly dropping the papers to look at you accusingly. "Before you start with that gender equality crap, I had a guy working here, and all he cared about was getting into the pants of female customers rather than their wallets. I''m saving myself from another headache...<i>hopefully</i>."'
 		*nl
-		'You''re at a loss for words. This wasn''t how you imagined the interview would go, but your silence goes unnoticed as the store manager continues to talk. "The salary is 205 <b>₽</b> a hour alright? Trust me, no one is fighting you for the chance to work here, but don''t think that means you can slack off. Miss work three times, and you''re fired... no questions. I have two part-time positions that are from 16:00 until 20:00 Monday through Friday or the weekend shift between 09:00 and 15:00."'
+		'You''re at a loss for words. This wasn''t how you imagined the interview would go, but your silence goes unnoticed as the store manager continues to talk. "The salary is 205 <b>₽</b> a hour alright? Trust me, no one is fighting you for the chance to work here, but don''t think that means you can slack off. Miss work three times, and you''re fired... no questions. I have two part-time positions that are from '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' Monday through Friday or the weekend shift between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'."'
 		*nl
 		'He seems to have found what he was looking for, which is the employment documents, "You''ll need to sign these to start work here." He holds them out to you, "So, are you interested?"'
 
@@ -60,7 +60,7 @@ if $ARGS[0] = 'apply':
 				minut += 5
 				*nl
 				'You find the conditions suitable, and without batting an eye, you sign the documents.'
-				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
+				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 				act 'Continue': gt 'shop_pussycats', 'start'
 			end
 			act 'Take the weekend job':
@@ -70,7 +70,7 @@ if $ARGS[0] = 'apply':
 				minut += 5
 				*nl
 				'You find the conditions suitable, and without batting an eye, you sign the documents.'
-				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
+				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.'
 				act 'Continue': gt 'shop_pussycats', 'start'
 			end
 !!			act 'Take the full time job':
@@ -407,13 +407,13 @@ if $ARGS[0] = 'reapply':
 			work = 1
 			young_shop_work = 1
 			minut += 5
-			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
+			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 			gt 'shop_pussycats', 'start'
 		end
 		act 'Accept work during the weekend':
 			young_shop_work1 = 1
 			minut += 5
-			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
+			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.'
 			gt 'shop_pussycats', 'start'
 		end
 		act 'Leave':gt 'shop_pussycats', 'start'

+ 5 - 5
locations/anushka_konstantinov_schedule.qsrc

@@ -332,7 +332,7 @@ end
 if $ARGS[0] = 'getLocation':
 	!Set the text for the current NPC ID
 	if locat['A144'] = 0:
-		$npcLocation['A144'] = 'Anushka not home Fri and Sat 20:00 for rest of night'
+		$npcLocation['A144'] = 'Anushka not home Fri and Sat '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' for rest of night'
 	elseif locat['A144'] = 1: 
 		$npcLocation['A144'] = 'Anushka in the hallway at her city apartment'
 	elseif locat['A144'] = 2:
@@ -348,15 +348,15 @@ if $ARGS[0] = 'getLocation':
 	elseif locat['A144'] = 7:
 		$npcLocation['A144'] = 'Anushka in the bathroom'
 	elseif locat['A144'] = 8:
-		$npcLocation['A144'] = 'Anushka is in the garage with the band Wed 18-23'
+		$npcLocation['A144'] = 'Anushka is in the garage with the band Wed '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+''
 	elseif locat['A144'] = 9:
 		$npcLocation['A144'] = 'Anushka is at her job at the The Coffee Hole'
 	elseif locat['A144'] = 10:
-		$npcLocation['A144'] = 'Anushka is at the University classes 09:00 to 15:00'
+		$npcLocation['A144'] = 'Anushka is at the University classes '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+''
 	elseif locat['A144'] = 11:
-		$npcLocation['A144'] = 'Anushka is at the modeling studio First Sat of each month 8:00 to 16:00'
+		$npcLocation['A144'] = 'Anushka is at the modeling studio First Sat of each month '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+''
 	elseif locat['A144'] = 12:
-		$npcLocation['A144'] = 'Anushka is at the University Library Mon and Wed from 15:00 till 18:00'
+		$npcLocation['A144'] = 'Anushka is at the University Library Mon and Wed from '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+' till '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+''
 	end
 end
 

+ 1 - 1
locations/arkadi_fyodorov_schedule.qsrc

@@ -118,7 +118,7 @@ end
 if $ARGS[0] = 'getLocation':
 	!Set the text for the current NPC ID
 	if locat['A156'] = 0:
-		$npcLocation['A156'] = 'Arkadi not home Fri and Sat 20:00 for rest of night.'
+		$npcLocation['A156'] = 'Arkadi not home Fri and Sat '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' for rest of night.'
 	elseif locat['A156'] = 1:
 		$npcLocation['A156'] = 'Arkadi in the hallway.'
 	elseif locat['A156'] = 2:

+ 2 - 2
locations/bdsm_mansion.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'taxi':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/club.jpg"></center>'
 	if hour < 16 and hour > 2:
 		bdsmclub['unlocked'] = 1
-		'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. You attempt to enter the secret club but the guard tells you it is closed. You show your card and he tells you to come back after 16:00.'
+		'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. You attempt to enter the secret club but the guard tells you it is closed. You show your card and he tells you to come back after '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.'
 		act 'Leave':gt 'city_suburbs', 'start'
 	else
 		'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. From the booth comes a guard, you show him the business card. Without saying anything, he opens the gate and points you towards the door. You walk alone a marble tiled walkway past the neatly clipped shrubs and flower beds. An other guard meets you, and leads you into the mansion through the main door.'
@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 		act 'Go to the elite settlement':gt 'city_suburbs', 'start'
 		if hour < 16 and hour > 2:
 			*nl
-			'The club is closed until 16:00.'
+			'The club is closed until '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.'
 			act 'Leave':gt 'city_suburbs', 'start'
 		else
 			if bdsmclub['training_daystart'] ! daystart:

+ 1 - 1
locations/bedrPar.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 				detention_warning = daystart
-				msg 'You have detention this morning and must be at school before 09:00.'
+				msg 'You have detention this morning and must be at school before '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.'
 			end
 
 			if mc_inventory['tech_computer'] = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'

+ 18 - 9
locations/blackmailer.qsrc

@@ -736,10 +736,19 @@ if $ARGS[0] = 'set_SMSTree':
 						else
 							$SMSTree['a4'] = 'What do you want from me?'
 						end
-						if rand(0, 1) = 0:
-							$SMSTree['b4'] = 'Where am I going to get that much money from?'
+						if blackmailQQW['total_material'] <= 4:
+							if rand(0, 1) = 0:
+								$SMSTree['b4'] = 'Where am I going to get that much money from?'
+							else
+								$SMSTree['b4'] = 'How much do you want before it stops?'
+							end
 						else
-							$SMSTree['b4'] = 'How much do you want before it stops?'
+							if rand(0, 1) = 0:
+								$SMSTree['b4'] = 'What about lowering the amount?'
+							else
+								$SMSTree['b4'] = 'What can I do to lower that?'
+							end
+
 						end
 
 	$SMSTree['5'] = 'Just drop off the money'
@@ -752,8 +761,8 @@ if $ARGS[0] = 'set_SMSTree':
 		$SMSTree['11b'] = 'or you could do something special for us'
 
 			$SMSTree['a12'] = 'fuck you'
-			$SMSTree['b12'] = 'Send a (non-nude) selfie from your galleray'
-			$SMSTree['c12'] = 'Send a selfie from your galleray'
+			$SMSTree['b12'] = 'Send a (non-nude) selfie from your gallery'
+			$SMSTree['c12'] = 'Send a selfie from your gallery'
 			$SMSTree['d12'] = 'what?'
 			$SMSTree['e12'] = 'yes sir'
 
@@ -805,7 +814,7 @@ if $ARGS[0] = 'Add_SMS_repeat':
 		gs 'SMStext_builder', 'receive', $SMSTree['3']
 		if blackmailQW['next_payment'] < 2000 and blackmailQW['total_payment'] < 5000:
 			gs 'SMStext_builder', 'add_reply', $SMSTree['a4'], 'blackmailer', 'sms_repeat_end1', 'a4'
-		elseif blackmailQW['stage'] < 8 and blackmailQW['next_payment'] < 3000:
+		elseif blackmailQW['stage'] <= 6 or (blackmailQW['stage'] = 7 and blackmailQW['next_payment'] < 3000):
 			gs 'SMStext_builder', 'add_reply', $SMSTree['b4'], 'blackmailer', 'sms_repeat_switch1', 'a', $SMSTree['b4']
 		elseif blackmailQW['stage'] = 7:
 			gs 'SMStext_builder', 'add_reply', $SMSTree['b4'], 'blackmailer', 'sms_repeat_switch1', 'b', $SMSTree['b4']
@@ -852,7 +861,7 @@ if $ARGS[0] = 'sms_repeat_switch1':
 		gs 'SMStext_builder', 'receive', $SMSTree['11' + $ARGS[1]]
 
 		gs 'SMStext_builder', 'add_reply', $SMSTree['a12'], 'blackmailer', 'sms_repeat_end1', 'a12'
-		if blackmailQW['stage'] < 6:
+		if blackmailQW['stage'] <= 5:
 			gs 'SMStext_builder', 'send_selfie', $SMSTree['b12'], 'c|sw|u|ft|fa', 'blackmailer', 'sms_repeat_switch2'
 		else
 			gs 'SMStext_builder', 'send_selfie', $SMSTree['c12'], 'c|sw|u|n|b|sh|ft|fa|fp', 'blackmailer', 'sms_repeat_switch2'
@@ -894,13 +903,13 @@ if $ARGS[0] = 'sms_repeat_switch2':
 
 		elseif strpos('bath|shower|titflash|assflash', $ARGS[4]) > 0:
 			blackmailQW['next_payment'] -= 1000
-			if blackmailQW['stage'] = 5: blackmailQW['stage'] = 6
+			if blackmailQW['stage'] < 6: blackmailQW['stage'] = 6
 			gs 'blackmailer', 'add_blackmail_selfie', $ARGS[2], $ARGS[3], $ARGS[4], ARGS[5], ARGS[6]
 			$temp_path = 'c'
 
 		elseif strpos('nude|pussyflash', $ARGS[4]) > 0:
 			blackmailQW['next_payment'] -= 2000
-			if blackmailQW['stage'] = 6: blackmailQW['stage'] = 7
+			if blackmailQW['stage'] < 7: blackmailQW['stage'] = 7
 			gs 'blackmailer', 'add_blackmail_selfie', $ARGS[2], $ARGS[3], $ARGS[4], ARGS[5], ARGS[6]
 			$temp_path = 'd'
 		end

+ 2 - 2
locations/booty_call.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'invite_yourself1':
 			cla & *nl
 			'<b><font color="pink">when do you get off?</font></b>'
 			'<b><font color="pink">this is a booty call</font></b>'
-			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
+			'	<b><font color="blue">ill probably be free at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
 			gs 'booty_call', 'invite_yourself2'
 		end
@@ -427,7 +427,7 @@ if $ARGS[0] = 'invite_yourself1':
 			cla & *nl
 			'<b><font color="pink">i wanna fuck</font></b>'
 			'<b><font color="pink">when do you get off?</font></b>'
-			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
+			'	<b><font color="blue">ill probably be free at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
 			gs 'booty_call', 'invite_yourself2'
 		end

+ 3 - 3
locations/buklinik.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli.jpg"></center>'
 	'A well-known homeless shelter in a run-down building. Looking above the entrance you can see a sign saying, Mercy Clinic.'
 	'There is a note by the entrance.'
-	'Working hours: 09:00 to 17:00'
+	'Working hours: '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+''
 	temp = rand(1, 10)
 	if temp = 9:'A crowd of homeless people have huddled together trying to see if there are any available beds...'
 	if temp = 2:'A homeless person is trying to get into the shelter...'
@@ -231,8 +231,8 @@ if $ARGS[0] = 'stol':
 	'There''s a large canteen with lots of tables and chairs with loads of space. This is probably the biggest room in the building.'
 	*nl
 	'There is a sign by the entrance:'
-	'Breakfast: 08:00 - 09:30'
-	'Dinner: 17:00 - 19:00'
+	'Breakfast: '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 9, 30, cheatVars['time_format'])+''
+	'Dinner: '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+''
 
 	act 'Leave the canteen':gt 'buklinik', 'holl'
 end

+ 1 - 1
locations/burger.qsrc

@@ -727,7 +727,7 @@ if $ARGS[0] = 'boss':
 								work = 1
 								BurgerQW['Secretary'] = 1
 								gs 'stat'
-								'You agree to become a secretary to Anatoly Borisovich. He takes your CV, makes a copy of your passport and diploma, and tells you. "Come to work here every weekday, no later than 9 am, you must wear an office outfit. You will receive calls, take letters, and copy documents, and you have to do any other general office work as required. You will work until 17:00, your salary will be paid into your bank account every month."'
+								'You agree to become a secretary to Anatoly Borisovich. He takes your CV, makes a copy of your passport and diploma, and tells you. "Come to work here every weekday, no later than '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+', you must wear an office outfit. You will receive calls, take letters, and copy documents, and you have to do any other general office work as required. You will work until '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+', your salary will be paid into your bank account every month."'
 
 								act 'Leave':gt 'burger', 'start'
 							end

+ 2 - 2
locations/casting.qsrc

@@ -132,7 +132,7 @@ end
 if $ARGS[0] = 'details':
 	gs 'casting', 'audition_schedule'
 	'Pay: <<acting[''pay'']>> <b>₽</b>'
-	'Audition time: 16:00-18:00, <<$week[audition[''week'']]>>, <<audition[''calendar_day'']>> of <<$audition[''month'']>>.'
+	'Audition time: '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', <<$week[audition[''week'']]>>, <<audition[''calendar_day'']>> of <<$audition[''month'']>>.'
 !!	'Shoot time: <<acting_shoot_time>>:00'
 end
 
@@ -440,7 +440,7 @@ if $ARGS[0] = 'YulyaGavrikov':
 	'Synopsis: Unashamed is a comedic drama that follows the Gavrikov family as they struggle through their problems of self image, romance, sexual identity, work and life balance, and most of all what it means to stick together as a family and be able to love each other without shame.'
 	*nl
 	'Role Description: Yulya is a sexually free and uninhibited university student who is constantly getting into trouble with her many hookups. Though constantly getting together with people and desperately wanting some kind of genuine attachment, Yulya fears commitment and tries to cover up the fact by keeping her partners at an emotional arms length through sex and physicality.'
-	'Audition: Room <<audition[''room'']>> - 16:00-18:00, <<$week[audition[''week'']]>>, <<audition[''calendar_day'']>> of <<$audition[''month'']>>.'
+	'Audition: Room <<audition[''room'']>> - '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', <<$week[audition[''week'']]>>, <<audition[''calendar_day'']>> of <<$audition[''month'']>>.'
 	'Filming duration: 2 months'
 	act 'Return':
 		gs 'casting', 'clearcasting'

+ 2 - 2
locations/cikl.qsrc

@@ -727,9 +727,9 @@ if mid($start_type, 1, 2) = 'sg':
 					kanikuli = 6
 					SchoolAtestat = -1
 					lernHome = 0
-					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
+					$holyday = '<b>Your graduation is today. Be there by '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.</b>'
 				elseif day = 25:
-					$holyday = '<b>Your graduation is tomorrow. Be there by 8:00.</b>'
+					$holyday = '<b>Your graduation is tomorrow. Be there by '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.</b>'
 				elseif day >= 19:
 					$holyday = '<b>Your graduation is in <<26-day>> days.</b>'
 				end

+ 23 - 23
locations/city_center.qsrc

@@ -113,7 +113,7 @@ gs 'taxi'
 if hour >= 4 and hour < 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''metro'', ''start''">the metro</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 04:00''">the metro</a>'
+	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+'''">the metro</a>'
 end
 
 'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you''re tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
@@ -121,51 +121,51 @@ end
 if hour >= 8 and hour < 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at 08:00''">kiosk</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">kiosk</a>'
 end
-'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open between 08:00 and 22:00 and sells cheap magazines and cigarettes.'
+'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and sells cheap magazines and cigarettes.'
 *nl
 if hour = 8 and minut >= 30:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''city_mall''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">Havana Fitness Center</a>'
 elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''city_mall''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:gt ''havana'', ''start''">Havana Fitness Center</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at '+func('time', 'get_time_string', 8, 30, cheatVars['time_format'])+'''">The Galeria mall</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'
 if hour >= 6 and hour <= 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''foto'', ''start''">Aphrodite Photography</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 06:00''">Aphrodite Photography</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+'''">Aphrodite Photography</a>'
 end
 if hour >= 6 and hour <= 23:
 	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Diner Bystroeshka</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 06:00''">Diner Bystroeshka</a>'
+	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+'''">Diner Bystroeshka</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec:gt ''restoran'', ''start''">Babel</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at 08:00''">Babel</a>'
+	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Babel</a>'
 end
 'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place that sells cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
 *nl
 if week >= 4 and (hour >= 18 or hour <= 3):
 	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Thursday to Sunday at 18:00''">The nightclub</a>'
+	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Thursday to Sunday at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'''">The nightclub</a>'
 end
 'The only place open here at night is <<$desc_txt3>>.'
 *nl
 if (week < 6 and hour >= 8 and hour <= 16) or (week = 6 and hour >= 8 and hour <= 13):
 	$desc_txt1 = '<a href="exec:gt ''office'', ''start''">Titran-Express</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00 on Monday''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' on Monday''">Titran-Express</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Titran-Express</a>'
 end
 'Across the street is considered the business area. The large skyscraper there serves as the base of operations for <<$desc_txt1>>, an engineering company.'
 *nl
@@ -174,42 +174,42 @@ if casting = 0:
 elseif hour >= 7 and hour <= 20:
 	$desc_txt1 = '<a href="exec:gt ''talent_agency'', ''start''">Aurora talent agency</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 07:00''">Aurora talent agency</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'''">Aurora talent agency</a>'
 end
 if week < 6:
 	if hour >= 9 and hour <= 18:
 		$desc_txt2 = '<a href="exec:gt ''bank'', ''start''">VTB bank</a>'
 	else
-		$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen at 09:00''">VTB bank</a>'
+		$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">VTB bank</a>'
 	end
 else
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 09:00''">VTB bank</a>'
+	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">VTB bank</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec: minut += 1 & gt ''agentned'', ''start''">Kirsanova Realty</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 08:00''">Kirsanova Realty</a>'
+	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Kirsanova Realty</a>'
 end
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):
 	$desc_txt4 = '<a href="exec: minut += 3 & gt ''post_office'', ''start''">post office</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00 on Monday''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' on Monday''">post office</a>'
 else
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">post office</a>'
 end
 if hour >= 8 and hour <= 18:
 	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a> and <a href="exec: minut += 1 & gt ''city_hermitage'', ''start''">Hermitage Museum</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a> and <a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
+	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">National Library of Russia</a> and <a href="exec:msg ''The Hermitage Museum is closed and will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Hermitage Museum</a>'
 end
 'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>>, <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 1 & gt ''sentence'',''start''">The City Courthouse</a>'
 elseif week < 5 and hour > 17:
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 07:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'''">City Courthouse</a>'
 else
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 07:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'''">City Courthouse</a>'
 end
 $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main city police station</a>'
 'Away from the shops is both <<$desc_txt6>> and the <<$desc_txt7>>.'
@@ -218,9 +218,9 @@ $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main
 *nl
 if nichHotelReferral = 2 and nichWork ! 2 and nichWork ! 4:
 	if hour >= 4 and hour < 16:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too early for that. You should come back between 16:00 and 21:00.'
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too early for that. You should come back between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 	elseif hour < 4 or hour > 21:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too late for that. You should come back between 16:00 and 21:00.'
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too late for that. You should come back between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 	else
 		'You could go to the <a href="exec:gt ''nichApartment'', ''jobInterview''">apartment of a man named Nicholas</a> to apply for a job as a live-in maid.'
 	end

+ 3 - 3
locations/city_church.qsrc

@@ -26,9 +26,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/church/kazan.jpg"></center>'
 	'Kazan Cathedral, also known as the Cathedral of Our Lady of Kazan. It''s old and huge, it is well maintained by the worshipers of the parish.'
 	''
-	'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
-	'Vigil is held on Saturdays at 19:00.'
-	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
+	'You can attend confession every weekday between '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' or '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', and on the weekend between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
+	'Vigil is held on Saturdays at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
+	'The Divine Liturgy is on Sundays between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'.'
 	act 'Return to the city':minut += 5 & gt 'city_center'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'city_church', 'vigil'

+ 3 - 3
locations/city_clinic.qsrc

@@ -804,7 +804,7 @@ if $ARGS[0] = 'glavdoc':
 	if workhosp = 0:
 		'You enter the chief of staff''s office and ask him about the job.'
 		'The chief of staff looks at you. "Oh, you must be the girl Kat was talking about. I don''t have much time, so I''ll keep it short and take her word that you have the necessary experience."'
-		'He continues. "You''ll work five days per week, Mondays to Fridays. Your shift begins between 8:00 and 9:00, and finishes around 16:00. Miss a day and you don''t get paid. You''ll get 1,500 <b>₽</b> per shift, and your salary will be deposited onto your back account on the 25th of the month."'
+		'He continues. "You''ll work five days per week, Mondays to Fridays. Your shift begins between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+', and finishes around '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'. Miss a day and you don''t get paid. You''ll get 1,500 <b>₽</b> per shift, and your salary will be deposited onto your back account on the 25th of the month."'
 		'He looks at his watch again and shrugs. "You can sort out the rest of the details with the personnel department later. Do you want the job?"'
 	else
 		'You step into the office of the chief of staff.'
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'milk_donation_room':
 	act 'Go back': gt 'city_clinic','start'
 	if lactation['pc_aware'] > 0 and hour < 10 or hour > 19:
 		'The door seems to be locked and nobody is here.'
-		'A sign reads "Opening hours 10:00 to 19:00 daily.'
+		'A sign reads "Opening hours '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' daily.'
 	elseif lactation['pc_aware'] > 0 and hour >= 10 and hour <= 19:
 		'The door is open and someone is talking inside.'
 		act 'Go inside':
@@ -1376,7 +1376,7 @@ if $ARGS[0] = 'milk_donation':
 		'You put your top back on and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
 		act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	else
-		'The milk donation service is closed. It''s open every day between 10:00 and 19:00.'
+		'The milk donation service is closed. It''s open every day between '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
 		act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	end
 end

+ 1 - 1
locations/city_coffee_hole.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0]= 'start':
 	menu_off = 0
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/street_sign.jpg"></center>'
-	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are 07:00 to 23:00.'
+	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'.'
 	act 'Return to the city': gt 'city_island'
 	if hour >= 7 and hour < 22: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
 end

+ 1 - 1
locations/city_commcenter.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'lessons':
 	'<center><b>The Vladimir Lenin community center</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk1.jpg"></center>'
 	*nl
-	'Vladimir Lenin is open from 9am through to 5pm on weekdays, and closed on weekends.
+	'Vladimir Lenin is open from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' through to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on weekdays, and closed on weekends.
 	 It''s available to teach essential life skills such as driving, life coaching or finding new job skills this is the place to learn. '
 	*nl
 	'<B><center>Currently available courses:</center></B>'

+ 9 - 9
locations/city_industrial.qsrc

@@ -69,13 +69,13 @@ if $ARGS[0] = '':
 	if hour > 7 and hour < 23:
 		'You can see the <a href="exec:$loc = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 	else
-		'The kiosk is closed between 23:00 and 07:00.'
+		'The kiosk is closed between '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'.'
 	end
 
 	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''city_industrial_train'', ''outside''">train station</a>.'
 
 	if week = 3 or hour < 16:
-		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight.'
+		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and midnight.'
 	else
 		'The <a href="exec: minut += 5 & gt ''qwBarPolet''">Bar "Rabotnik"</a> seems to be open.'
 	end
@@ -86,22 +86,22 @@ if $ARGS[0] = '':
 	if hour >= 4 and hour < 23:
 		'The <a href="exec: minut += 5 & gt ''metro'', ''start''">metro station</a> is within a 5 minute walk from here.'
 	else
-		'The metro station is within a 5 minute walk from here, but it''s closed until 04:00.'
+		'The metro station is within a 5 minute walk from here, but it''s closed until '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+'.'
 	end
 	if func('autotraidF', 'is_open'):
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
 	else
-		'A car dealership is nearby' + iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.') + iif(car > 0 and cardrive = 9, ' Your <<$car>> is currently locked inside.', '')
+		'A car dealership is nearby' + iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.') + iif(car > 0 and cardrive = 9, ' Your <<$car>> is currently locked inside.', '')
 	end
 	if func('autoservisF', 'is_open'):
 		'Next to the car dealership is a <a href="exec: minut += 5 & gt ''autoservisF'', ''start''">repair shop</a>.'
 	else
-		'Next to the car dealership is a repair shop.' + iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.') + iif(car > 0 and cardrive = 7, ' Your <<$car>> is currently locked inside.', '')
+		'Next to the car dealership is a repair shop.' + iif(week = 7, 'It''s closed on Sundays.', 'It will be open between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.') + iif(car > 0 and cardrive = 7, ' Your <<$car>> is currently locked inside.', '')
 	end
 	if hour >= 9 and hour < 17 and week < 6:
 		'The <a href="exec: minut += 5 & gt ''city_commcenter'', ''start''">community center</a> is currently open.'
 	else
-		'The community center is currently closed. It''s only open during the week between 09:00 and 17:00.'
+		'The community center is currently closed. It''s only open during the week between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.'
 	end
 
 	if hour >= 9 and hour <= 17 and ($start_type['loc'] ! 'sg' or SchoolAtestat = 0) or bumtolik > 3:
@@ -112,12 +112,12 @@ if $ARGS[0] = '':
 	if hour >= 8 and hour <= 20:
 		'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec: minut += 2 & gt ''shop'', ''start''">supermarket</a>.'
 	else
-		'The empty parking lot, which is engulfed in bright lights, belongs to a supermarket that is open between 08:00 and 20:00'
+		'The empty parking lot, which is engulfed in bright lights, belongs to a supermarket that is open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+''
 	end
 	if hour >= 12 and hour <= 19:
 		'Above the door to a basement room is a bright neon sign for the <a href="exec: minut += 5 & gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>.'
 	else
-		'Above the door to a basement room is a bright neon sign for the Tattoo & Piercing parlor. The opening hours are 12:00 to 20:00'
+		'Above the door to a basement room is a bright neon sign for the Tattoo & Piercing parlor. The opening hours are '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+''
 	end
 	if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'
 
@@ -128,7 +128,7 @@ if $ARGS[0] = '':
 	if hour >= 14 or hour < 4:
 		'Located far away from the buildings is a <a href="exec: minut += 2 & gt ''lakecafe'', ''main''">barbecue</a>.'
 	else
-		'Located far away from the buildings is a barbecue. It''ll be open between 14:00 and 04:00'
+		'Located far away from the buildings is a barbecue. It''ll be open between '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+''
 	end
 	if jouryResult = 10: 'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri</a>.'
 	if BurgerQW['IlyQWTatianaHelp'] > 0:'In one of these buildings is <a href="exec:gt ''ilyroom''">Ilyushkin''s</a> apartment.'

+ 5 - 5
locations/city_island.qsrc

@@ -58,23 +58,23 @@ if hour >= 8 and hour <= 22:
 	'The <a href="exec: minut += 3 & gt ''uni_shop'', ''start''">supermarket</a> is not far from here.'
 	'You can see a <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 else
-	'The local convenience store is closed. It will reopen at 08:00.'
-	'You can see a closed kiosk. It''s open between 08:00 and 23:00.'
+	'The local convenience store is closed. It will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.'
+	'You can see a closed kiosk. It''s open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'.'
 end
 if hour >= 8 and hour < 22:
 	'You can see <a href="exec:gt ''shop_dolls'', ''start''">Patch Work Dolls</a>, a clothing store that caters to Alternative styles, like gothic, punk and skater. Next door is <a href="exec:gt ''shop_nerdvana'', ''start''">Nerdvana</a>, a clothing store that stock everything a nerd could desire.'
 else
-	'You can see Patch Work Dolls, a clothing store that caters to Alternative styles, like gothic, punk, skater. Next door is Nerdvana, the nerd clothing store. They both open every day between 08:00 and 22:00'
+	'You can see Patch Work Dolls, a clothing store that caters to Alternative styles, like gothic, punk, skater. Next door is Nerdvana, the nerd clothing store. They both open every day between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+''
 end
 if hour >= 7 and hour < 22:
 	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks away from the university.'
 else
-	'The Coffee Hole is closed. They reopen at 07:00.'
+	'The Coffee Hole is closed. They reopen at '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'.'
 end
 if hour >= 4 and hour < 23:
 	'The <a href="exec:minut += 1 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 else
-	'The Metro Station is closed. The first train will depart at 04:00.'
+	'The Metro Station is closed. The first train will depart at '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+'.'
 end
 if anushkaCityQW['first_visit'] > 0:
 	'Anushka lives in <a href="exec:minut += 1 & gt ''anushapt_city'', ''home''">a shared apartment</a> around the corner.'

+ 2 - 2
locations/city_kafe.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'fabi':
 	'His smile broadens and he looks a little less tired. "Ah, so you want to work here? Well why wouldn''t you? Rockabilly music, the greaser subculture, Cadillacs and motorcycles and hamburgers! I love this period of American culture, it''s so vibrant and exciting! I''ve put every ruble I have into making this place the perfect recreation of an American diner from 1958. Who doesn''t love that?"'
 	*nl
 	'A glance around the place shows you that the diner is barely half full, and most of those dining are eating Russian food rather than American. Fabi is still raving about America in the 1950s, talking about Elvis Presley, someone called Carl Perkins and cheeseburgers and French fries. His enthusiasm is honest and infectious, but you came here for a reason, so you clear your throat. "Fabi? About the job?"'
-	'He grins sheepishly. "Sorry, I get carried away sometimes. Let me tell you about the job. We''re open every day except Monday from 12:00 to 20:00 and you''d be working five days a week, Tuesday through Saturday. You''ll be expected to arrive between 11:00 and 12:00 to help get the place ready – if you''re late then you won''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
+	'He grins sheepishly. "Sorry, I get carried away sometimes. Let me tell you about the job. We''re open every day except Monday from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' and you''d be working five days a week, Tuesday through Saturday. You''ll be expected to arrive between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to help get the place ready – if you''re late then you won''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
 	'"Oh, and local regulations say I have to hold your work book as long as you''re employed here," he adds. "So... Are you interested?"'
 
 	act 'Yes':
@@ -132,7 +132,7 @@ if $ARGS[0] = 'fabi':
 		minut += 5
 		workKafe['job'] = 1
 		gs 'stat'
-		'You hand over your work book and Fabi takes it with a smile. "Good! Now remember, you have to be here between 11:00 and noon, Monday through Friday."'
+		'You hand over your work book and Fabi takes it with a smile. "Good! Now remember, you have to be here between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and noon, Monday through Friday."'
 		act 'Leave': gt 'city_kafe', 'start'
 	end
 	

+ 1 - 1
locations/city_lake.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'start':
 	if hour >= 8 and hour <= 17:
 		'There is a branch of the swimwear chain <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> here'
 	else
-		'There is a branch of the swimwear chain Allure here, but it is currently closed. It will reopen at 08:00.'
+		'There is a branch of the swimwear chain Allure here, but it is currently closed. It will reopen at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.'
 	end
 
 	if car > 0 and cardrive = 4:

+ 2 - 2
locations/city_market.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 			gs 'stat'
 
 			'Hi, my name is Arthur. I own many stalls here and I need a saleswoman. Want the job?'
-			'Pay is a percentage of sales, paid at end of shift. Your shifts would be Tuesdays, Thursdays and Saturdays from 08:00 to 14:00.'
+			'Pay is a percentage of sales, paid at end of shift. Your shifts would be Tuesdays, Thursdays and Saturdays from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'.'
 			'Government insist I have your papers, so it would be your main job.'
 
 			act 'Leave': gt 'city_market', 'start'
@@ -185,7 +185,7 @@ if $ARGS[0] = 'tailor':
 	menu_off = 0
 	gs 'stat'
 
-	'A sign reads, "Jacob Solomonovich Schneersohn, tailor, 8:00-16:00 Monday - Friday"'
+	'A sign reads, "Jacob Solomonovich Schneersohn, tailor, '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' Monday - Friday"'
 
 	act 'Speak to the tailor':
 		*clr & cla

+ 1 - 1
locations/city_nightclub.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'inside':
 		act 'Hear him out':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
-			'"The club opens at 6pm. You can work for an hour at a time, up to 1am. The jobs will vary, according to time and demand. It includes finding customers to bring to the club, promoting drinks, and some dancing."'
+			'"The club opens at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'. You can work for an hour at a time, up to '+func('time', 'get_time_string', 1, 0, cheatVars['time_format'])+'. The jobs will vary, according to time and demand. It includes finding customers to bring to the club, promoting drinks, and some dancing."'
 			'"Your pay will depend on results: get more people in and get them buying up the promotional drinks, or if you dance well, and you''ll get 200<b>₽</b>. Do worse, you get less. Do very well, you get a bonus. When you finish, you can stay in the club, so you get free entry as well."'
 			'"So, are you interested?"'
 			act 'No': clubno = 1 & gt 'city_nightclub', 'inside'

+ 2 - 2
locations/city_park.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	if hour >= 9 or hour <= 20:
 		'There is an all year <a href="exec:gt ''city_park'', ''luna''">fair</a> at the park, which you can visit.'
 	else
-		'There is an all year fair at the park, but it is closed. Opening hours from 9:00 to 21:00.'
+		'There is an all year fair at the park, but it is closed. Opening hours from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 	end
 
 	if car > 0 and cardrive = 5:
@@ -220,7 +220,7 @@ if $ARGS[0] = 'luna':
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/luna.jpg"></center>'
 	'The fun fair sits in the heart of the park and attracts families, people on vacation, and loving couples from all over the town. It''s a popular gathering spot and a place to forget your worries for a few hours.'
 	*nl
-	'Opening hours are 9:00 to 21:00'
+	'Opening hours are '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+''
 
 	if vladimirQW['stage'] = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
 

+ 5 - 5
locations/city_redlight.qsrc

@@ -29,28 +29,28 @@ if $ARGS[0] = 'start':
 	if hour >= 18 or hour < 3:
 		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Fuzzy Dice</a> strip club attract men from all over the city.'
 	else
-		'The strip club is closed for the day and will reopen at 18:00.'
+		'The strip club is closed for the day and will reopen at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
 	end
 	if pornstudio > 0 and hour >= 10 and hour < 22:
 		'The <a href="exec:gt ''pornstudio'', ''start''">porn studio</a> is housed within one of the few warehouses that hasn''t been abandoned.'
 	elseif pornstudio > 0 and (hour < 10 or hour >= 22):
-		'The porn studio is closed and will reopen at 10:00.'
+		'The porn studio is closed and will reopen at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'.'
 	end
 	if hour < 3 or hour >= 11:
 		'A <a href="exec:minut += 1 & gt ''shop_erotomaniac'', ''start''">seedy looking shop</a> that sells sex toys and other erotic merchandise is open for perverts from all around the city to browse its stock.'
 	else
-		'A seedy looking shop that sells sex toys and other erotic merchandise. It is currently closed and will reopen at 11:00.'
+		'A seedy looking shop that sells sex toys and other erotic merchandise. It is currently closed and will reopen at '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'.'
 	end
 	if bordel > 0 and func('bordel', 'is_open'): 'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 	if hour >= 10:
 		'You see a small <a href="exec:gt ''city_redlight'',''city_copy_shop''">printing shop</a> tucked away between two larger buildings.'
 	else
-		'You see a small printing shop tucked away between two larger buildings. It is currently closed and will open at 10:00.'
+		'You see a small printing shop tucked away between two larger buildings. It is currently closed and will open at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'.'
 	end
 		if hour >= 19 or hour < 2:
 		'A <a href="exec:gt ''hookahlounge'', ''start''">Hookah Lounge</a> sits on a corner, with Indian music and the scent of exotic spices streaming from an open door.'
 	else
-		'The Hookah Lounge is currently closed and will reopen at 19:00.'
+		'The Hookah Lounge is currently closed and will reopen at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
 	end
 
 	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'

+ 5 - 5
locations/city_residential.qsrc

@@ -129,22 +129,22 @@ if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''star
 if (hour >= 8 and hour <= 20) or preg = 2:
 	'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
 else
-	'The clinic is closed. It will open at 08:00.'
+	'The clinic is closed. It will open at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.'
 end
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:
 	'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
 elseif military = 1:
-	'The military bus will wait between 06:00 and 09:00 on Saturdays.'
+	'The military bus will wait between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' on Saturdays.'
 end
 if hour >= 8 and hour <= 14 and week ! 1:
 	'You could go shopping at the local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
 else
-	'You could go shopping at the local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
+	'You could go shopping at the local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.')
 end
 if hour >= 8 and hour <= 15 and week < 6:
 	'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
 else
-	'Near the market is a tailor shop where you can get your clothes resized if needed. '+iif(week < 6, 'It closes at 16:00.', 'It''s closed on weekends.')
+	'Near the market is a tailor shop where you can get your clothes resized if needed. '+iif(week < 6, 'It closes at '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.', 'It''s closed on weekends.')
 end
 if hour = 11 and week > 1 and week < 7 and workKafe['job'] = 1:
 	'The side door of <a href="exec: minut += 1 & gt ''city_kafe'', ''work''">The Roadhouse</a> diner is open, allowing you to enter and start your shift.'
@@ -153,7 +153,7 @@ elseif hour >= 12 and hour <= 20 and week ! 1:
 elseif hour > 20 and hour <= 3:
 	'You can hear some <a href="exec:gt ''gopnew'', ''start''">gopniks</a> laughing and swearing in the parking lot of The Roadhouse diner. The diner itself is currently closed.'
 else
-	'The Roadhouse diner is currently closed. It''s open between 12:00 and 20:00 every day except Monday.'
+	'The Roadhouse diner is currently closed. It''s open between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' every day except Monday.'
 end
 if clener >= 1 and hour >= 7 and hour <= 22: 'There''s a small office building where a <a href="exec: minut += 1 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 

+ 1 - 1
locations/city_saunawhore.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'saunawork':
 	'<center><b><font color="maroon">Sauna</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
 	''
-	'The sauna is open to "customers" between 08:00 and 00:00.'
+	'The sauna is open to "customers" between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 0, 0, cheatVars['time_format'])+'.'
 	'All the walls are covered in <a href="exec:gt ''mirror'', ''start''">mirrors</a>.'
 
 	if saunaWorkNow = 1:

+ 2 - 2
locations/city_smalloffice.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 		if hour >= 8 and hour <= 16 and week < 6:
 			'The door to the<a href="exec:gt ''city_trademission''">Trade Mission</a> is open.'
 		else
-			'The door of the trade mission is closed. There''s a note on the door, Open hours: Saturday and Sunday 8:00--16:00'
+			'The door of the trade mission is closed. There''s a note on the door, Open hours: Saturday and Sunday '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'--'+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+''
 		end
 	end
 
@@ -327,7 +327,7 @@ if $ARGS[0] = 'start':
 				act 'You''re ashamed of me?':
 					cla
 					'You let go off your cleaning stuff and look straight into Yuri''s eyes, asking him, "Are you ashamed of me?"'
-					'Yuri stammers, "I-I''m not embarrassed by you being a cleaner, but you must understand, I''m a manager, and you''re the cleaning lady. We must not be seen together. But I want you to keep seeing you. You know where I live, come by my place after 16:00."'
+					'Yuri stammers, "I-I''m not embarrassed by you being a cleaner, but you must understand, I''m a manager, and you''re the cleaning lady. We must not be seen together. But I want you to keep seeing you. You know where I live, come by my place after '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'."'
 
 					gs 'willpower', 'misc', 'self'
 					if will_cost <= pcs_willpwr:

+ 2 - 2
locations/courtletter.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'letter':
 			end
 
 			'<i>Failing to appear in court will have dire consequences for the accused.</i> Your heart drops as you read that line...'
-			'<i>The court is located in the city center. You should arrive at 9:00 as there are a lot of cases and we can''t say when your turn might come up.</i>'
+			'<i>The court is located in the city center. You should arrive at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' as there are a lot of cases and we can''t say when your turn might come up.</i>'
 			'You put the letter back in the envelope and let out a loud sigh...'
 
 		else
@@ -211,7 +211,7 @@ if $ARGS[0] = 'letter':
 			end
 
 			'<i>Failing to appear in court will have dire consequences for the accused.</i> Your heart drops as you read that line...'
-			'<i>The court is located in the city center. You should arrive at 9:00 as there are a lot of cases and we can''t say when your turn might come up.</i>'
+			'<i>The court is located in the city center. You should arrive at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' as there are a lot of cases and we can''t say when your turn might come up.</i>'
 			'You put the letter back in the envelope and let out a loud sigh...'
 
 		else

+ 3 - 3
locations/emp_job_array.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'emp_tourist_guide':
 	$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'
+	$emp_job_notes[j_id] = 'Summer job with flexible days - start between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+''
 
 	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
@@ -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 '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' to start your shift.'
 	if emp_job_status[j_id] < 1:
 		emp_job_status[j_id] = 0
 	end
@@ -108,7 +108,7 @@ if $ARGS[0] = 'emp_titran':
 	$emp_job_title[j_id] = 'Secretary'
 	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.'
+	$emp_job_notes[j_id] = 'You work as a secretary at Titran Express. You need to come to work by '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' 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

+ 1 - 1
locations/etoexhib.qsrc

@@ -765,7 +765,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 				gs 'stat'
 				'<center><b><font color="maroon">Personnel department</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_cadr.jpg"></center>'
-				'"Hello!" Welcomes the Human Relations employee. She tells you that they need a certified teacher. Working days are Monday to Saturday from 14:00 to 16:00. The pay is 300 <b>₽</b> per day, plus a room in a hostel. The terms of the contract say that, because they pay a full salary, at the moment there are no free meals. There is a strict dress code: business attire is required. Also, it is not recommended for women to have bright makeup or strong perfume.'
+				'"Hello!" Welcomes the Human Relations employee. She tells you that they need a certified teacher. Working days are Monday to Saturday from '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'. The pay is 300 <b>₽</b> per day, plus a room in a hostel. The terms of the contract say that, because they pay a full salary, at the moment there are no free meals. There is a strict dress code: business attire is required. Also, it is not recommended for women to have bright makeup or strong perfume.'
 
 				if university['diploma'] = 1 or university['fakediplom'] = 1:
 					act 'Pass an interview for a job':

+ 10 - 10
locations/foto_events.qsrc

@@ -336,15 +336,15 @@ if $ARGS[0] = 'commercial':
 						casting = 3
 						if week >= 6:
 							SMTV_commercial = daystart - week + 13
-							'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be there next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+							'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be there next Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 							act 'Thank him and go':gt 'foto','studio'
 						else
 							SMTV_commercial = daystart - week + 6
 							if week = 5:
-								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 								act 'Thank him and go':gt 'foto','studio'
 							else
-								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 								act 'Thank him and go':gt 'foto','studio'
 							end
 						end
@@ -365,15 +365,15 @@ if $ARGS[0] = 'commercial':
 							casting = 3
 							if week >= 6:
 								SMTV_commercial = daystart - week + 13
-								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here next Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 								act 'Thank him and go':gt 'foto','studio'
 							else
 								SMTV_commercial = daystart - week + 6
 								if week = 5:
-									'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+									'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 									act 'Thank him and go':gt 'foto','studio'
 								else
-									'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+									'He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 									act 'Thank him and go':gt 'foto','studio'
 								end
 							end
@@ -397,15 +397,15 @@ if $ARGS[0] = 'commercial':
 							end
 							if week >= 6:
 								SMTV_commercial = daystart - week + 13
-								'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here next Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 								act 'Thank him and go':gt 'foto','studio'
 							else
 								SMTV_commercial = daystart - week + 6
 								if week = 5:
-									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here tomorrow at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 									act 'Thank him and go':gt 'foto','studio'
 								else
-									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for the <b>Aurora Talent Agency</b> in the city center. "Be here on Saturday at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+', this is where they said they were going to set up the shoot."'
 									act 'Thank him and go':gt 'foto','studio'
 								end
 							end
@@ -2161,7 +2161,7 @@ if $ARGS[0] = 'runway2':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'Hey <<$model[''firstname'']>>, listen. We have an emergency situation and we''re looking for whoever is available. A clothing studio we sometimes shoot for is having a fashion show tonight but for some reason something''s gone wrong and they''re missing models."'
 			'"Missing models?" you gasp. "You mean like they''ve disappeared or something?"'
-			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until 22:00 tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
+			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
 			gs 'willpower', 'exhib', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act'"I''m sorry, I can''t be out that late" (<<will_cost>> Willpower)':

+ 2 - 2
locations/gad_church.qsrc

@@ -27,8 +27,8 @@ if $ARGS[0] = 'start':
 	'The local church is small and relatively old, it is not in the best shape, but it appears well-loved.'
 	*nl
 	!!'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
-	'The vigil is held on Saturdays at 19:00.'
-	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
+	'The vigil is held on Saturdays at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
+	'The Divine Liturgy is on Sundays between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'.'
 	act 'Go to the village square': minut += 3 & gt 'gadukino'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'gad_church', 'vigil'

+ 1 - 1
locations/gad_gpbarn.qsrc

@@ -362,7 +362,7 @@ if $ARGS[0] = 'barn_room':
 
 	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 		detention_warning = daystart
-		msg 'You have detention this morning and must be at school before 09:00.'
+		msg 'You have detention this morning and must be at school before '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.'
 	end
 
 	if mc_inventory['tech_computer'] = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'

+ 3 - 3
locations/gad_gpbath.qsrc

@@ -90,7 +90,7 @@ end
 if $ARGS[0] = 'alone':
 	if week >= 6:
 		if hour >= 12 and hour <= 18:
-			'You put the wood into the stove to feed the fire. The banya will be ready to use around 19:00.'
+			'You put the wood into the stove to feed the fire. The banya will be ready to use around '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
 		elseif hour > 18 and hour < 22:
 			'The banya is now ready.'
 
@@ -126,10 +126,10 @@ if $ARGS[0] = 'alone':
 				end
 			end
 		else
-			'The banya is not in use at this time. However, it is available between 19:00 and 22:00 during the weekend.'
+			'The banya is not in use at this time. However, it is available between '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' during the weekend.'
 		end
 	elseif week < 6:
-		'The banya is not used during the week. However, it is usually ready to use from 19:00 during the weekend.'
+		'The banya is not used during the week. However, it is usually ready to use from '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' during the weekend.'
 	end
 	*nl
 

+ 2 - 2
locations/gadukino.qsrc

@@ -115,9 +115,9 @@ if $ARGS[0] = '':
 
 		if month >= 6 and month <= 9:
 			if hour >= 6 and hour <= 16:
-				'An old farm truck is parked halfway off one of the roads nearby. The farmer who owns it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He makes multiple trips from Gadukino to the city daily to ensure the freshest produce so he can be found from 6 am to 4 pm.'
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who owns it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He makes multiple trips from Gadukino to the city daily to ensure the freshest produce so he can be found from '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.'
 			else
-				'This time of year, a truck usually comes by multiple times a day between 6 am and 4 pm to purchase mushrooms and berries from the locals.'
+				'This time of year, a truck usually comes by multiple times a day between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' to purchase mushrooms and berries from the locals.'
 			end
 		else
 			'During the summer, a truck usually comes into town from the city to buy fresh mushrooms and berries from the locals. It''s not the right season for it right now, though.'

+ 3 - 3
locations/gdksport.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">community center</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
-	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec: gt ''gdksport'',''dance1''">Dance</a> and <a href="exec: gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
+	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec: gt ''gdksport'',''dance1''">Dance</a> and <a href="exec: gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+''
 	*nl
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
@@ -122,7 +122,7 @@ if $ARGS[0] = 'start':
 					act 'Play in Tournament': '<br><font color="red">You are to exhausted to do this. Recover your stamina before trying to play.</font>'
 				end
 			elseif week = 6 and sorevday ! daystart and hour > 18:
-				'As you look around, you don''t see anyone from the team. You suddenly realize that there was a tournament game today and you were supposed to be here at 18:00! You missed the bus and the coach is going to be furious!'
+				'As you look around, you don''t see anyone from the team. You suddenly realize that there was a tournament game today and you were supposed to be here at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'! You missed the bus and the coach is going to be furious!'
 				gs 'npc_relationship', 'modify', 'A69', -20
 				sorevday = daystart
 				act 'Back': gt 'gdksport', 'start'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'vball5':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
-	'The tournament starts at 19:00. Your bus departs at 18:00. You gather your things together with the rest of the team and get on a bus that takes you to the out of town match.'
+	'The tournament starts at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'. Your bus departs at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'. You gather your things together with the rest of the team and get on a bus that takes you to the out of town match.'
 	act 'Leave': gt 'gdksport', 'start'
 	act 'Get on bus and go to play':
 		volltime = 0

+ 1 - 1
locations/gkafe.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = '':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 	*nl
-	'A small shabby cafe attached to the train station. It''s closed right now, but is usually open between 08:00 and 20:00.'
+	'A small shabby cafe attached to the train station. It''s closed right now, but is usually open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.'
 
 	act 'Leave':gt 'pav_market'
 

+ 2 - 2
locations/gschool_cheerleading.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'afterschool_practice':
 	*clr & cla
 	cheerleadingQW['day'] = daystart
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/gymdoors.jpg"></center>'
-    'You''re standing next to the doors leading to the PE hall. You have cheerleading practice at 14:15 and should go and change if you don''t want to be late.'
+    'You''re standing next to the doors leading to the PE hall. You have cheerleading practice at '+func('time', 'get_time_string', 14, 15, cheatVars['time_format'])+' and should go and change if you don''t want to be late.'
 	*nl
 	if cheerleadingQW['skipped'] = 0:
 		'You recall how angry Albina was at that Karine girl who skipped practice. It probably wouldn''t be a good idea to do it yourself.'
@@ -253,7 +253,7 @@ if $ARGS[0] = 'afterschool_game':
 	*clr & cla
 	cheerleadingQW['day'] = daystart
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
-	'There is a football game at 14:15 on the sports field behind the school today.'
+	'There is a football game at '+func('time', 'get_time_string', 14, 15, cheatVars['time_format'])+' on the sports field behind the school today.'
 	*nl
 	if cheerleadingQW['skipped'] = 0:
 		'You recall how angry Albina was at that Karine girl, and that was just for skipping practice. It probably wouldn''t be a good idea to skip a game.'

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -774,7 +774,7 @@ if $ARGS[0] = 'change_room':
 		end
 	end
 	*nl
-	'The locker room is accessed through the school gym and is left unlocked until 18:30 each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here' + iif(pcs_piercings['any'], ', and <a href="exec: gt ''piercing_management'', ''main''">manage your piercings</a>', '') + '.'
+	'The locker room is accessed through the school gym and is left unlocked until '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+' each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here' + iif(pcs_piercings['any'], ', and <a href="exec: gt ''piercing_management'', ''main''">manage your piercings</a>', '') + '.'
 	*nl
 
 	if (hour = 18 and minut >= 30) or hour > 18:

+ 3 - 3
locations/gschool_lessons4.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'math':
 		VK = rand(1,3)
 		VKrand = rand(1,2)
 		'You take a few seconds to sit down and get yourself settled in when Mr. Tsarev stands up to begin today''s lesson.'
-		'"Math determines many important aspects of daily life. For example, you need math to determine the current date and time. If today is the 17th, then tomorrow will be the 18th. How do I know that? Seventeen plus one equals eighteen. Time is no different and some countries have different ways of displaying time. For example, some display time in 12 hour increments, showing 17:00 as 5pm."'
+		'"Math determines many important aspects of daily life. For example, you need math to determine the current date and time. If today is the 17th, then tomorrow will be the 18th. How do I know that? Seventeen plus one equals eighteen. Time is no different and some countries have different ways of displaying time. For example, some display time in 12 hour increments, showing 17:00 as 5 PM."'
 		*nl
 		if VKrand = 1 and npc_grupTipe['A189'] = 4:
 			if NikoPayback > 0:
@@ -709,10 +709,10 @@ if $ARGS[0] = 'pe':
 	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is present.'
 	if week = 5 and runnerQW['pav_stage'] = 0:
 		if runnerQW['pav_racetype'] = 0: runnerQW['pav_racetype'] = 1
-		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
+		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'. If you want to participate, you should come to school between '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'.'
 	elseif week = 5 and runnerQW['pav_stage'] = 1:
 		if runnerQW['pav_racetype'] = 0: runnerQW['pav_racetype'] = 2
-		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
+		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'. If you want to participate, you should come to school between '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'.'
 	end
 	act 'Continue':
 		*clr & cla

+ 1 - 1
locations/gschool_socialchg.qsrc

@@ -325,7 +325,7 @@ if $ARGS[0] = 'nerd':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
 		'You nod your head. "Yes, I would love to hang out with you guys! A game night sounds like a lot of fun."'
-		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great, <<$pcs_nickname>>! Meet us at the community center library tonight at 20:00. See you then." Then, they all start leaving and going to class, saying they look forward to seeing you tonight.'
+		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great, <<$pcs_nickname>>! Meet us at the community center library tonight at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'. See you then." Then, they all start leaving and going to class, saying they look forward to seeing you tonight.'
 
 		!! Used at the first d&d game to se if Sveta is new in the nerd group.
 		if grupTipe['joined_nerds'] = 0: grupTipe['joined_nerds'] = 1

+ 1 - 1
locations/havana.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'tanyaIntroduction':
 	'"Yes, can I have them back, please?" you ask, while holding out your hand.'
 	'"Nope. You seduced me. I have never been with a girl before and I think I earned this as a memento." With these words, Tanya slips your panties in her pocket.'
 	'"My name is Tanya by the way. I live only a short distance from here with my parents. You might come over if you like. Usually I''m home in the late afternoon. We could continue were we left off." she winks at you and leaves.'
-	'<i>You can now visit Tanya at her parents home in the Downtown area once a day after 16:00.</i>'
+	'<i>You can now visit Tanya at her parents home in the Downtown area once a day after '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.</i>'
 	act 'Back':gt 'havana', 'dressing_room'
 
 end

+ 1 - 1
locations/hotel_anna.qsrc

@@ -67,7 +67,7 @@ if ARGS[0] = 1:
 			'"I-i.." You stammer a little taken aback...did she ask if you want to learn more about what she was doing?'
 			'"No need to answer now. Come visit me if you are interested. I''m sure it is something new for you so I understand your concern, and I assure it will be a simple chit-chat. Do you know for example that what you have seen is more common than you think? You can learn something useful maybe I have some tips for your spying hobby too." She smiles.'
 			'Did she say shit? "I don''t know. It''s a lot to take in. I was worried about my job and now you are talking about teaching me about... Whatever this all is."'
-			'"<<$pcs_nickname>>, I''m not going to say anything about your peeking to anyone whatever happens. I should have locked the door so that is my fault, I was playing a game of risk. Knowing someone might open the door at any time it is thrilling and dangerous." She pauses. "You can come to visit me here on Mondays and Tuesdays at 20:00 if you decide you want to learn. We''ll chit-chat a little and maybe come to some other arrangements in the future to satisfy your curiosity.".'
+			'"<<$pcs_nickname>>, I''m not going to say anything about your peeking to anyone whatever happens. I should have locked the door so that is my fault, I was playing a game of risk. Knowing someone might open the door at any time it is thrilling and dangerous." She pauses. "You can come to visit me here on Mondays and Tuesdays at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' if you decide you want to learn. We''ll chit-chat a little and maybe come to some other arrangements in the future to satisfy your curiosity.".'
 			'"I''m grateful Miss Igorevna, I will have to think about it."'
 			'"I''m glad you came and please, call me Anna. Now I have things to do so you''ll have to leave for now." Anna Igorevna leads you to the door. "See you soon <<$pcs_nickname>>."'
 

+ 5 - 5
locations/intro_sg.qsrc

@@ -110,14 +110,14 @@ if $ARGS[0] = 'intro_pavlovsk':
 				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 				'You let out an exasperated sigh. "Yeah yeah I know, you told me that already. So how early are we talking?"'
-				'Your mother shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at 06:00 for school."'
+				'Your mother shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' for school."'
 				act 'Continue':
 					*clr & cla
 					minut += 2
 					gs 'stat'
 					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
+					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'?"'
 					'Your mother shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns before making her way towards the kitchen.'
 					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month!" she adds quickly.'
 					act 'But why do I--':
@@ -191,9 +191,9 @@ if $ARGS[0] = 'intro_gadukino':
 				*nl
 				'You release an exasperated sigh. "Yeah, I know. You told me that already. So how early are we talking?"'
 				if month = 6:
-					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at 06:00 when she used to sleep here. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
+					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' when she used to sleep here. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
 				else
-					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at 06:00 for school. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
+					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember correctly, Anya used to wake up at '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' for school. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
 				end
 				act 'Continue':
 					*clr & cla
@@ -202,7 +202,7 @@ if $ARGS[0] = 'intro_gadukino':
 					'<center><H4>Your Grandparents'' Cottage</H4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 					*nl
-					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
+					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'?"'
 					if month = 6:
 						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners, or your grandparents will have started work without you, and I won''t be having any of that," she warns you before making her way outside.'
 						if pcs_vag = 0: '"Oh, don''t forget; when you get back to Pavlovsk, you need to head to the clinic and see the gynaecologist for a check-up. Not just once, but every month," she adds quickly.'

+ 2 - 2
locations/journal.qsrc

@@ -213,8 +213,8 @@ if $ARGS[0] = 'relationstab':
 			'Your school social group consists of jocks and natural athletes.' + $journal_school_standing
 		elseif grupTipe = 3:
 			'Your school social group consists of nerds, geeks and good students.' + $journal_school_standing
-			if nerd_game['game_day'] > daystart: 'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>> at 20:00 in the community center library.'
-			if nerd_game['game_day'] = daystart: 'You have been invited to a games night tonight at 20:00 in the community center library.'
+			if nerd_game['game_day'] > daystart: 'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the community center library.'
+			if nerd_game['game_day'] = daystart: 'You have been invited to a games night tonight at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the community center library.'
 		elseif grupTipe = 4:
 			'Your school social group consists of gopniks, rebels, punks or troublemakers.' + $journal_school_standing
 		elseif grupTipe = 5:

+ 5 - 5
locations/journal_quests.qsrc

@@ -169,7 +169,7 @@ if $ARGS[0] = 'start':
 			elseif kotovVSprohorov = 1:
 				'I''m feeling dirty. I should take a shower at the sports center.'
 			else
-				'I see Ivan at the sports center around 17:00 a lot. I should try and chat with him then.'
+				'I see Ivan at the sports center around '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' a lot. I should try and chat with him then.'
 			end
 		else
 			'If I want to get to know Ivan better, I should spend some time chatting with him during school.'
@@ -347,7 +347,7 @@ if $ARGS[0] = 'start':
 		if NatbelQW['disco_invite'] = 3 and NatbelQW['shopping'] = 2:
 			'It seems like Natasha wants to ask something of you. Maybe you should talk to her.'
 		elseif NatbelQW['shopping'] = 3 and NatBelQW['FriendLover'] = 7:
-			'You''ve promised Natasha to take her to St. Petersburg ' + iif(daystart < natbelQW['StP_trip_daystart'], 'in <<natbelQW[''StP_trip_daystart'']-daystart>> days', iif((week=6 and hour < 14), 'today', 'next saturday')) + ', picking her up at her place between 12:00 and 14:00.'
+			'You''ve promised Natasha to take her to St. Petersburg ' + iif(daystart < natbelQW['StP_trip_daystart'], 'in <<natbelQW[''StP_trip_daystart'']-daystart>> days', iif((week=6 and hour < 14), 'today', 'next saturday')) + ', picking her up at her place between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'.'
 		end
 
 		*nl
@@ -406,7 +406,7 @@ if $ARGS[0] = 'start':
 					elseif kotovVSprohorov = 1:
 						'I should take a shower at the sports center. If the rumors I heard about Ivan are true, he should try to join me.'
 					else
-						'I want to use Ivan to somehow make the coach jealous. I should start by chatting with him in the sports section when he shows up, usually around 17:00.'
+						'I want to use Ivan to somehow make the coach jealous. I should start by chatting with him in the sports section when he shows up, usually around '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.'
 					end
 				else
 					'I need something to make the coach jealous of me. Ivan spends a lot of time at the sports center, maybe I can use him to my advantage? I should put some effort into getting to know him better.'
@@ -556,10 +556,10 @@ if yearstart > 1 and university['enrolled_in_semester'] > university['semester_p
 
 		if katjaQW['slut'] <75 and katjaQW['liberated'] = 0:
 			'Katja is a good girl who studies a lot, but sometimes on Thursday she will watch a movie in her dorm room at night instead of going to the library.'
-			'She also goes partying on Friday evening, where she will prepare in her dorm room from 19:00 to 19:45. Saturday and Sunday she spends at her mother''s house in Pavlovsk.'
+			'She also goes partying on Friday evening, where she will prepare in her dorm room from '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 19, 45, cheatVars['time_format'])+'. Saturday and Sunday she spends at her mother''s house in Pavlovsk.'
 		else
 			'Katja is a good girl who studies a lot but has started to loosen up. On Thursday she doesn''t study at night but will watch a movie in her dorm or maybe go partying.'
-			'She also goes partying on Friday evening, where she will prepare in her dorm room from 19:00 to 19:45. Saturday night is also spent partying and Sunday she spends at her mother''s house in Pavlovsk.'
+			'She also goes partying on Friday evening, where she will prepare in her dorm room from '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 19, 45, cheatVars['time_format'])+'. Saturday night is also spent partying and Sunday she spends at her mother''s house in Pavlovsk.'
 		end
 
 		!!if katjaQW['pantiesQWstage'] = 0:

+ 23 - 23
locations/journal_work.qsrc

@@ -27,34 +27,34 @@ if $ARGS[0] = 'start':
 
 	if arrsize('evt_event') ! 0: gs 'emp_functions', 'disp_evt', 2
 
-	if workPTU > 2: 'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
+	if workPTU > 2: 'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'. Your salary is 300 <b>₽</b> per day.'
 	if work = 1 or cheatVars['work'] = 1:
-		if workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between 11:00 and 12:00. Your wages are received on the 25th of each month, but you can earn tips from customers.'
-		if workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
-		if worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between 09:00 and 10:00. Salary is automatically transferred on the 25th of each month.'
-		if workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by 09:00. Salary is automatically transferred on the 25th of each month.'
+		if workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'. Your wages are received on the 25th of each month, but you can earn tips from customers.'
+		if workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' during the week. Salary is automatically transferred on the 25th of each month.'
+		if worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month.'
+		if workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month.'
 		if tanwork > 0: 'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
-		if young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 16:00 Monday to Friday. Your salary is paid once a week on Fridays.'
-		if young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. Your salary is paid once a week on Fridays.'
-		if young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. Your salary is paid once a week on Fridays.'
+		if young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' Monday to Friday. Your salary is paid once a week on Fridays.'
+		if young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' Saturday and Sunday. Your salary is paid once a week on Fridays.'
+		if young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' Monday through Friday. Your salary is paid once a week on Fridays.'
 		if workFabrika = 1: 'You work as a seamstress in the factory in Pavlovsk. You work every week day and your salary is automatically transferred on the 25th of each month.'
-		if gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
+		if gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 !!		if TourGuide = 1: 'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b>.'
 	end
-	if workrin = 1: 'You are working in Arthur''s tent at the market as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
+	if workrin = 1: 'You are working in Arthur''s tent at the market as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'. Salary depends on sales.'
 	if maidqw = 1:
-		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
+		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' and your salary is 250 <b>₽</b> plus tips.'
 	elseif GermanQW = 1:
-		'You can find out more about becoming a maid at the Pavlovsk hotel if you visit the manager between 12:00 and 14:00.'
+		'You can find out more about becoming a maid at the Pavlovsk hotel if you visit the manager between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'.'
 	end
-	if postjobQW = 2 or postjobQW = 4: 'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b>.'
-	if stripwork >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. No salary as you earn tips.'
-	if stripwork1 >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. No salary as you earn tips.'
+	if postjobQW = 2 or postjobQW = 4: 'You deliver mail for the postmaster. The work day starts each Saturday between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'. Salary is 450 <b>₽</b>.'
+	if stripwork >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 3, 0, cheatVars['time_format'])+'. No salary as you earn tips.'
+	if stripwork1 >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 3, 0, cheatVars['time_format'])+'. No salary as you earn tips.'
 !!	if stripbarwork >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
 !!	if stripbarwork1 >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
 	if film > 0: 'You are working as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4: 'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
-	if bumtolik >= 5: 'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'
+	if bumtolik >= 5: 'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on Saturday and Sunday.'
 
 	*nl
 
@@ -107,17 +107,17 @@ if $ARGS[0] = 'start':
 		*nl
 		'You have worked <<masseuse[''shifts_worked'']>> shifts at the salon this week.'
 		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
-			'<BR><b><font color="blue">You have a shift at the salon today at 09:00.</font></b>'
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.</font></b>'
 		elseif masseuse['<<week>>_shift_1'] = 1 and hour <= 9:
-			'<BR><b><font color="red">You''re late for your 09:00 shift at the salon!</font></b>'
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
 		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
-			'<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'.</font></b>'
 		elseif masseuse['<<week>>_shift_2'] = 1 and hour <= 13:
-			'<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>'
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
 		elseif masseuse['<<week>>_shift_3'] = 1 and hour < 17:
-			'<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.</font></b>'
 		elseif masseuse['<<week>>_shift_3'] = 1 and hour <= 17:
-			'<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>'
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
 		end
 	end
 
@@ -131,7 +131,7 @@ if $ARGS[0] = 'start':
 			end
 		else
 			if hour < 11:
-				'<br>You are expected to be in the porn studio at 10:00.'
+				'<br>You are expected to be in the porn studio at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'.'
 			elseif hour >= 11 and hour < 13:
 				'<br>You should be at the porn studio!'
 			elseif hour >= 13:

+ 1 - 1
locations/kotovdom.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'home':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	
-!! Vitek''s location, he is home for 2 hours after school and from say Sat and Sun from noon to 4pm
+!! Vitek''s location, he is home for 2 hours after school and from say Sat and Sun from noon to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'
 
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotov_home.jpg"></center>'

+ 1 - 1
locations/kseniyaQW.qsrc

@@ -218,7 +218,7 @@ if $ARGS[0] = 'event3_1':
 							'"I know I tricked you there but I find special customers for a very private shop. The address is on the card."'
 							'""You have a lovely body by the way." Ksenya blows you a kiss and leaves. By the time you are dressed she is long gone.'
 							*nl
-							'You look at the card again, "Simply Salacious" just off Pushkin Okhlopkov Square. Open Mon-Sat, 08:00 - 18:00'
+							'You look at the card again, "Simply Salacious" just off Pushkin Okhlopkov Square. Open Mon-Sat, '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+''
 
 							act 'Leave': gt $loc, $loc_arg
 						end

+ 10 - 10
locations/lakecafe.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'main':
 	'<center><B><font color=maroon>The Lake Cafe</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/lakecafe.jpg"></center>'
 	'An old-fashioned BBQ café/diner near the lake, known for offering relatively cheap but tasty meals.'
-	'Opening hours are from 14:00 until 04:00'
+	'Opening hours are from '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+''
 	*nl
 
 	act 'Leave the cafe': minut += 2 & gt 'city_industrial'
@@ -221,7 +221,7 @@ if $ARGS[0] = 'barmensha':
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/lakebarmensha.jpg"></center>'
 				if LCworkwork2 < 1:
 					'"I''m looking for a job. Would you happen to know about anything?" you ask Eugene with a smile.'
-					'She ponders for a second before answering. "Actually, my sister always complains about how busy she is in the kitchen during the early evening hours. If you come between 18:00 and 19:00, you could probably help her out for a bit. We''d pay you 300 <b>₽</b> for your troubles!"'
+					'She ponders for a second before answering. "Actually, my sister always complains about how busy she is in the kitchen during the early evening hours. If you come between '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+', you could probably help her out for a bit. We''d pay you 300 <b>₽</b> for your troubles!"'
 					'You smile at and thank her, saying you''ll keep it in mind.'
 					LCworkwork2 = 1
 					LCwork2 = 1
@@ -230,7 +230,7 @@ if $ARGS[0] = 'barmensha':
 						gt 'lakecafe', 'barmensha'
 					end
 				else
-					'When you ask Eugene about a job, she laughs. "Did you forget <<$pcs_nickname>>? I already told you that my sister could use some help in the kitchen! If you come between 18:00 and 19:00, you can help her out for a bit and we''ll pay you 300 <b>₽</b> for your time."'
+					'When you ask Eugene about a job, she laughs. "Did you forget <<$pcs_nickname>>? I already told you that my sister could use some help in the kitchen! If you come between '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+', you can help her out for a bit and we''ll pay you 300 <b>₽</b> for your time."'
 					act 'Thank her for the reminder':
 						minut += 4
 						gt 'lakecafe', 'barmensha'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'barmensha':
 								*clr & cla
 								npc_love['A89'] -= 5
 								gs 'npc_relationship', 'modify', 'A89', -20
-								'You refuse to relent and Eugene sighs. "All our regulars know that we ''arrange meetings'' every Monday between 22:00 and 23:00. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means, but I beg you, please don''t do it <<$pcs_nickname>>!"'
+								'You refuse to relent and Eugene sighs. "All our regulars know that we ''arrange meetings'' every Monday between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means, but I beg you, please don''t do it <<$pcs_nickname>>!"'
 								'You see tears forming in her eyes.'
 								gs 'willpower', 'misc', 'self', 'easy'
 								if will_cost <= pcs_willpwr:
@@ -292,7 +292,7 @@ if $ARGS[0] = 'barmensha':
 						act 'Press for more information':
 							*clr & cla
 							'You press Eugene for more information and Eugene seems to be hurt by your insistance, but she reluctantly relents.'
-							'"All our regulars know that we ''arrange meetings'' every Monday between 22:00 and 23:00. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
+							'"All our regulars know that we ''arrange meetings'' every Monday between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
 							'Before you leave, she adds "Please don''t do it though. I''m starting to care for you and..." She looks away from you before finishing her sentence.'
 							gs 'willpower', 'misc', 'self', 'easy'
 							if will_cost <= pcs_willpwr:
@@ -325,13 +325,13 @@ if $ARGS[0] = 'barmensha':
 						end
 					else
 						if LCknowslut = 0:
-							'Eugene ponders for a minute before deciding that she can trust you. "We... we do offer special services, once a week. It''s every Monday, at 22:00. I''m not sure it''s something you would be interested in though..."'
+							'Eugene ponders for a minute before deciding that she can trust you. "We... we do offer special services, once a week. It''s every Monday, at '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+'. I''m not sure it''s something you would be interested in though..."'
 							'She confesses when she sees the confusion on your face. "It''s... it''s borderline prostitution, really. Some of the girls working here earn some extra money on the side by offering themselves to our customers after work. It happened sporadically at first, but then it became so popular that we organize a weekly event now. Customers can hook up with our waitresses, and our waitresses can earn some extra cash if they want. Everybody wins... right?"'
 							act 'Ask for more information':
 								*clr & cla
 								'Eugene notices the spark in your eye and laughs. "I see you might be interested after all!"'
 								'You play it cool. "Maybe. But just in case I were, how does it work?"'
-								'She gives you a kind smile. "I trust you, so... okay. I''ll let you do it if you want. Like I said, all our regulars know that we ''arrange meetings'' every Monday between 22:00 and 23:00. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
+								'She gives you a kind smile. "I trust you, so... okay. I''ll let you do it if you want. Like I said, all our regulars know that we ''arrange meetings'' every Monday between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
 								'Before you leave, she adds "Keep in mind that the diner is just a meeting area; whatever happens when you leave with someone is between you and them! Don''t embarrass us though, we''d hate to lose regular customers, no matter how perverted they might be!" She added the last bit with a laugh and a wink.'
 								act 'Say you''ll think about it':
 									*clr & cla
@@ -343,7 +343,7 @@ if $ARGS[0] = 'barmensha':
 							end
 						else
 							'Eugene smiles at you. "This is something right up your alley"'
-							'All our regulars know that we ''arrange meetings'' every Monday between 22:00 and 23:00. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say: ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 2,000 <b>₽</b>."'
+							'All our regulars know that we ''arrange meetings'' every Monday between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'. If you''re here at that time and want to earn some money, introduce yourself to the person or group you want to service and say: ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 2,000 <b>₽</b>."'
 							'Before you leave, she adds "Keep in mind that the diner is just a meeting area; whatever happens when you leave with someone is between you and them! Don''t embarrass us though, we''d hate to lose regular customers, no matter how perverted they might be."'
 							act 'Thank her for the information':
 								*clr & cla
@@ -357,7 +357,7 @@ if $ARGS[0] = 'barmensha':
 				elseif LCworkwork = 1:
 					if LCknowslut = 1 and npc_love['A89'] > 30:
 						'Eugene glares at you.'
-						'"Did you come to brag about how much of a slut you are, <<$pcs_firstname>>? If you want to whore yourself out, come here on Monday night between 22:00 and 23:00 and show the men here what kind of a person you are. Just don''t lose us any customers."'
+						'"Did you come to brag about how much of a slut you are, <<$pcs_firstname>>? If you want to whore yourself out, come here on Monday night between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+' and show the men here what kind of a person you are. Just don''t lose us any customers."'
 						'She turns around and walks away from you.'
 						npc_love['A89'] = -5
 						act 'Continue':
@@ -365,7 +365,7 @@ if $ARGS[0] = 'barmensha':
 							gt 'lakecafe', 'barmensha'
 						end
 					else
-						'"So you''re still interested in that, huh?" she smirks when you mention the special work. "Like I said, our regulars know that we ''arrange meetings'' every Monday between 22:00 and 23:00. If you''re here at that time and want to earn some money using your body, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
+						'"So you''re still interested in that, huh?" she smirks when you mention the special work. "Like I said, our regulars know that we ''arrange meetings'' every Monday between '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'. If you''re here at that time and want to earn some money using your body, introduce yourself to the person or group you want to service and say ''I''ll be your waitress tonight.'' They''ll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."'
 						act 'Thank her for the reminder':
 							minut += 3
 							gt 'lakecafe', 'barmensha'

+ 3 - 3
locations/leonid.qsrc

@@ -786,7 +786,7 @@ end
 
 if $ARGS[0] = 'call':
 	minut += 2
-	'<<$pcs_firstname>>, be at 20:00 at the office. Understood?'
+	'<<$pcs_firstname>>, be at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' at the office. Understood?'
 	leonidVisit = 1
 	minut += 1
 	gs 'stat'
@@ -796,9 +796,9 @@ end
 if $ARGS[0] = 'callMissed':
 	minut += 2
 	if leonidVisitMissed <= 2:
-		'Are you forgetting what you are, slave? Be at 20:00 at the office and don''t fail me again, or there will be consequences. Understood?'
+		'Are you forgetting what you are, slave? Be at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' at the office and don''t fail me again, or there will be consequences. Understood?'
 	elseif leonidVisitMissed >= 3:
-		'This is your last warning, slave. If you won''t come to my office today at 20:00, bad things will happen. Understood?'
+		'This is your last warning, slave. If you won''t come to my office today at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+', bad things will happen. Understood?'
 	end
 	leonidVisit = 1
 	minut += 1

+ 84 - 84
locations/masseuse_schedule.qsrc

@@ -51,15 +51,15 @@ if $ARGS[0] = 'start':
 !! First Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_1'] = 0 and masseuse['7_shift_1_taken'] < 2 and no (week = 7 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['7_shift_1_taken'] = 2 or (week = 7 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['7_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -67,15 +67,15 @@ if $ARGS[0] = 'start':
 !! First Monday Shift
 
 	if masseuse['1_shift_1'] = 0 and masseuse['1_shift_1_taken'] < 2 and no (week = 1 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['1_shift_1_taken'] = 2 or (week = 1 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['1_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -83,15 +83,15 @@ if $ARGS[0] = 'start':
 !! First Tuesday Shift
 
 	if masseuse['2_shift_1'] = 0 and masseuse['2_shift_1_taken'] < 2 and no (week = 2 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['2_shift_1_taken'] = 2 or (week = 2 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['2_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -99,15 +99,15 @@ if $ARGS[0] = 'start':
 !! First Wednesday Shift
 
 	if masseuse['3_shift_1'] = 0 and masseuse['3_shift_1_taken'] < 2 and no (week = 3 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['3_shift_1_taken'] = 2 or (week = 3 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['3_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -115,15 +115,15 @@ if $ARGS[0] = 'start':
 !! First Thursday Shift
 
 	if masseuse['4_shift_1'] = 0 and masseuse['4_shift_1_taken'] < 2 and no (week = 4 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['4_shift_1_taken'] = 2 or (week = 4 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['4_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -131,15 +131,15 @@ if $ARGS[0] = 'start':
 !! First Friday Shift
 	
 	if masseuse['5_shift_1'] = 0 and masseuse['5_shift_1_taken'] < 2 and no (week = 5 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['5_shift_1_taken'] = 2 or (week = 5 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['5_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -147,15 +147,15 @@ if $ARGS[0] = 'start':
 !! First Saturday Shift
 
 	if masseuse['6_shift_1'] = 0 and masseuse['6_shift_1_taken'] < 2 and no (week = 6 and hour > 8 and hour < 13):
-		'<a href="exec:masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['6_shift_1_taken'] = 2 or (week = 6 and hour > 8 and hour < 13):
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['6_shift_1'] = 2:
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'09:00-13:00 shift'
+		''+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
@@ -166,15 +166,15 @@ if $ARGS[0] = 'start':
 !! Second Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_2'] = 0 and masseuse['7_shift_2_taken'] < 2 and no (week = 7 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['7_shift_2_taken'] = 2 or (week = 7 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['7_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -182,15 +182,15 @@ if $ARGS[0] = 'start':
 !! Second Monday Shift
 
 	if masseuse['1_shift_2'] = 0 and masseuse['1_shift_2_taken'] < 2 and no (week = 1 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['1_shift_2_taken'] = 2 or (week = 1 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['1_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -198,15 +198,15 @@ if $ARGS[0] = 'start':
 !! Second Tuesday Shift
 
 	if masseuse['2_shift_2'] = 0 and masseuse['2_shift_2_taken'] < 2 and no (week = 2 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['2_shift_2_taken'] = 2 or (week = 2 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['2_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -214,15 +214,15 @@ if $ARGS[0] = 'start':
 !! Second Wednesday Shift
 
 	if masseuse['3_shift_2'] = 0 and masseuse['3_shift_2_taken'] < 2 and no (week = 3 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['3_shift_2_taken'] = 2 or (week = 3 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['3_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -230,15 +230,15 @@ if $ARGS[0] = 'start':
 !! Second Thursday Shift
 
 	if masseuse['4_shift_2'] = 0 and masseuse['4_shift_2_taken'] < 2 and no (week = 4 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['4_shift_2_taken'] = 2 or (week = 4 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['4_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -246,15 +246,15 @@ if $ARGS[0] = 'start':
 !! Second Friday Shift
 	
 	if masseuse['5_shift_2'] = 0 and masseuse['5_shift_2_taken'] < 2 and no (week = 5 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['5_shift_2_taken'] = 2 or (week = 5 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['5_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -262,15 +262,15 @@ if $ARGS[0] = 'start':
 !! Second Saturday Shift
 
 	if masseuse['6_shift_2'] = 0 and masseuse['6_shift_2_taken'] < 2 and no (week = 6 and hour > 12 and hour < 17):
-		'<a href="exec:masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['6_shift_2_taken'] = 2 or (week = 6 and hour > 12 and hour < 17):
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['6_shift_2'] = 2:
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'13:00-17:00 shift'
+		''+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
@@ -281,15 +281,15 @@ if $ARGS[0] = 'start':
 !! Third Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_3'] = 0 and masseuse['7_shift_3_taken'] < 2 and no (week = 7 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['7_shift_3_taken'] = 2 or (week = 7 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['7_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -297,15 +297,15 @@ if $ARGS[0] = 'start':
 !! Third Monday Shift
 
 	if masseuse['1_shift_3'] = 0 and masseuse['1_shift_3_taken'] < 2 and no (week = 1 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['1_shift_3_taken'] = 2 or (week = 1 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['1_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -313,15 +313,15 @@ if $ARGS[0] = 'start':
 !! Third Tuesday Shift
 
 	if masseuse['2_shift_3'] = 0 and masseuse['2_shift_3_taken'] < 2 and no (week = 2 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['2_shift_3_taken'] = 2 or (week = 2 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['2_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -329,15 +329,15 @@ if $ARGS[0] = 'start':
 !! Third Wednesday Shift
 
 	if masseuse['3_shift_3'] = 0 and masseuse['3_shift_3_taken'] < 2 and no (week = 3 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['3_shift_3_taken'] = 2 or (week = 3 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['3_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -345,15 +345,15 @@ if $ARGS[0] = 'start':
 !! Third Thursday Shift
 
 	if masseuse['4_shift_3'] = 0 and masseuse['4_shift_3_taken'] < 2 and no (week = 4 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['4_shift_3_taken'] = 2 or (week = 4 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['4_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -361,15 +361,15 @@ if $ARGS[0] = 'start':
 !! Third Friday Shift
 	
 	if masseuse['5_shift_3'] = 0 and masseuse['5_shift_3_taken'] < 2 and no (week = 5 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['5_shift_3_taken'] = 2 or (week = 5 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['5_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
@@ -377,15 +377,15 @@ if $ARGS[0] = 'start':
 !! Third Saturday Shift
 
 	if masseuse['6_shift_3'] = 0 and masseuse['6_shift_3_taken'] < 2 and no (week = 6 and hour > 16 and hour < 21):
-		'<a href="exec:masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift</a>'
 	elseif masseuse['6_shift_3_taken'] = 2 or (week = 6 and hour > 16 and hour < 21):
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>not available</i>'
 	elseif masseuse['6_shift_3'] = 2:
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<i>already worked</i>'
 	else
-		'17:00-21:00 shift'
+		''+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+' shift'
 		'<a href="exec:masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'

+ 2 - 2
locations/mey_tamara_events.qsrc

@@ -329,7 +329,7 @@ if $args[0] = 'learning1':
 
 					if newdress_id > 0:
 						'"I picked a real sexy outfit, it''s so sexy that the boys will spontaneously be cumming in their pants." you said smiling.'
-						'"Good! Now remember it''s only to be used in school. Now lets start training you how to walk elegantly. You can start by getting out of my car and take a walk around the city for a couple hours" Tamara hands you two thousand rubles. "It''s important that you take care of your health so take the money and head over to the clinic and get a health exam, within the next couple weeks. I''ll be waiting for you by the Babel restaurant at 21:00, don''t be late."'
+						'"Good! Now remember it''s only to be used in school. Now lets start training you how to walk elegantly. You can start by getting out of my car and take a walk around the city for a couple hours" Tamara hands you two thousand rubles. "It''s important that you take care of your health so take the money and head over to the clinic and get a health exam, within the next couple weeks. I''ll be waiting for you by the Babel restaurant at '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+', don''t be late."'
 
 						killvar 'newdress_id'
 						killvar 'newdress_count'
@@ -376,7 +376,7 @@ if $args[0] = 'learning1':
 						act 'Return to the Meynolds residence': mey_vika['mey_vika_qw'] = 40 & minut += 30 & gt 'mey_home', 'start'
 						act 'Stay in the city':
 							cla
-							'"No, dear. I need you to stay near here if you want I can drive you home to me or if you want to walk around the city. Either way you will need to kill a couple of hours. I''m feeling hungry so I''ll go and get something to eat." She says. "Whatever you decide, I expect you to be by the restaurant by 21:00, I''ll be waiting for you there."<br>'
+							'"No, dear. I need you to stay near here if you want I can drive you home to me or if you want to walk around the city. Either way you will need to kill a couple of hours. I''m feeling hungry so I''ll go and get something to eat." She says. "Whatever you decide, I expect you to be by the restaurant by '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+', I''ll be waiting for you there."<br>'
 
 							act 'I insist staying here in the city': mey_vika['mey_vika_qw'] = 36 & gt 'city_center'
 							act 'Return to the Meynolds residence': mey_vika['mey_vika_qw'] = 40 & minut += 30 & gt 'mey_home', 'start'

+ 22 - 29
locations/miroslava_schedule.qsrc

@@ -122,6 +122,7 @@ if $ARGS[0] = 'update_locat':
 		locat['A60'] = 10
 		exit
 	end
+
 	if MiraVars['follower'] = 1:
 		MiraVars['follower'] = 0
 		! Mira is your follower, so set her location to your location.
@@ -226,17 +227,17 @@ if $ARGS[0] = 'get_base_schedule':
 	if locat['A60_rand'] = 0:
 		!!				0-8,	8-10,	10-14,	14-16,	16-18,	18-20,	20-00
 		!! Sched0:		Home,	Forest,	Beach,	Gad,	Meadow,	Gad,	gopn
-		if hour <= 7:
+		if hour < 8:
 			locat['A60'] = 10
-		elseif hour <= 9:
+		elseif hour < 10:
 			locat['A60'] = 60
-		elseif hour <= 13:
+		elseif hour < 14:
 			locat['A60'] = 51
-		elseif hour <= 15:
+		elseif hour < 16:
 			locat['A60'] = 30
-		elseif hour <= 17:
+		elseif hour < 18:
 			locat['A60'] = 61
-		elseif hour <= 19:
+		elseif hour < 20:
 			locat['A60'] = 30
 		else
 			locat['A60'] = 42
@@ -245,11 +246,11 @@ if $ARGS[0] = 'get_base_schedule':
 	elseif locat['A60_rand'] = 1:
 		!!				0-10,	10-16,	16-20,	20-00
 		!! Sched1:		Home,	Beach	grandp,	home
-		if hour <= 9:
+		if hour < 10:
 			locat['A60'] = 10
-		elseif hour <= 15:
+		elseif hour < 16:
 			locat['A60'] = 51
-		elseif hour <= 19:
+		elseif hour < 20:
 			locat['A60'] = 20
 		else
 			locat['A60'] = 10
@@ -258,25 +259,25 @@ if $ARGS[0] = 'get_base_schedule':
 	elseif locat['A60_rand'] = 2:
 		!!				0-8,	8-10,	10-14,	14-16,	16-18,	18-20,	20-00
 		!! Sched2:		Home,	Forest,	Meadow,	Beach,	Meadow,	Forest,	gopn
-		if hour <= 7:
+		if hour < 8:
 			locat['A60'] = 10
-		elseif hour <= 9:
+		elseif hour < 10:
 			locat['A60'] = 60
-		elseif hour <= 13:
+		elseif hour < 14:
 			locat['A60'] = 61
-		elseif hour <= 15:
+		elseif hour < 16:
 			locat['A60'] = 51
-		elseif hour <= 17:
+		elseif hour < 18:
 			locat['A60'] = 61
-		elseif hour <= 19:
+		elseif hour < 20:
 			locat['A60'] = 60
 		else
 			locat['A60'] = 42
 		end
 
 	elseif locat['A60_rand'] = 3:
-		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
-		!! Sched3:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		!!				0-8,	8-14,		14-18,	18-00
+		!! Sched3:		Home,	grandp,	Beach,	Home
 		if hour < 8:
 			locat['A60'] = 10
 		elseif hour < 14:
@@ -288,8 +289,8 @@ if $ARGS[0] = 'get_base_schedule':
 		end
 
 	elseif locat['A60_rand'] = 4:
-		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
-		!! Sched4:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		!!				0-8,	8-10,	10-14,	14-20,	20-00
+		!! Sched4:		Home,	Forest,	Meadow,	Beach,	Home
 		if hour < 8:
 			locat['A60'] = 10
 		elseif hour < 10:
@@ -303,24 +304,16 @@ if $ARGS[0] = 'get_base_schedule':
 		end
 
 	elseif locat['A60_rand'] = 5:
-		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
-		!! Sched5:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		!!				0-8,	8-10,	10-14,	14-18,	18-00
+		!! Sched5:		Home,	Meadow,	Forest,	Gad,	grandp
 		if hour < 8:
 			locat['A60'] = 10
 		elseif hour < 10:
 			locat['A60'] = 61
-		elseif hour < 12:
-			locat['A60'] = 60
 		elseif hour < 14:
 			locat['A60'] = 60
-		elseif hour < 16:
-			locat['A60'] = 30
 		elseif hour < 18:
 			locat['A60'] = 30
-		elseif hour < 20:
-			locat['A60'] = 20
-		elseif hour < 22:
-			locat['A60'] = 20
 		else
 			locat['A60'] = 20
 		end

+ 1 - 1
locations/music_checks.qsrc

@@ -2,7 +2,7 @@
 
 !! Del Parco Storyline Stages
 !! ml_delparcoQW['Stage'] = 0 - Storyline hasn''t started yet.
-!! ml_delparcoQW['Stage'] = 1 - Sveta declines the offer when they meet while she is busking. Zariyah tells her to visit her office next Friday around 4pm.
+!! ml_delparcoQW['Stage'] = 1 - Sveta declines the offer when they meet while she is busking. Zariyah tells her to visit her office next Friday around '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.
 !! ml_delparcoQW['Stage'] = 2 - Sveta accepts the offer when they meet while she is busking.  Zariyah tells her to think about it, and that if she changes her mind, just visit her in her office.
 !! ml_delparcoQW['Stage'] = 3 -
 !! ml_delparcoQW['Stage'] = 4 -

+ 2 - 2
locations/music_delparco.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'firstdiscussion':
 		*clr & cla
 		ml_delparcoQW['Stage'] = 4
 		'"I would love to do it!" you almost bite your tongue as you stop, but the fact that someone asks you to play is a first step to your dream. You almost couldn''t contain yourself.'
-		'"Excellent!" Zariyah smiles at you, and pushes the paper she was writing on towards you "Everything is there. Don''t forget, two weeks from now, Friday at 8pm, so please be here latest half past seven.
+		'"Excellent!" Zariyah smiles at you, and pushes the paper she was writing on towards you "Everything is there. Don''t forget, two weeks from now, Friday at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+', so please be here latest half past seven.
 		Trust me, you will need the time to set yourself up. And then every Friday if it works out."'
 		ml_gigday['delparco'] = daystart + 19 - week
 		ml_gighour['delparco'] = 19
@@ -81,7 +81,7 @@ if $ARGS[0] = 'acceptafterthinking':
 	ml_delparcoQW['Stage'] = 4
 
 	'"I would love to do it!" you almost bite your tongue as you stop, but the fact that someone asks you to play is a first step to your dream. You almost couldn''t contain yourself.'
-	'"Excellent!" Zariyah smiles at you, and pushes the paper she was writing on towards you "Everything is there. Don''t forget, two weeks from now, Friday at 8pm, so please be here latest half past seven.
+	'"Excellent!" Zariyah smiles at you, and pushes the paper she was writing on towards you "Everything is there. Don''t forget, two weeks from now, Friday at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+', so please be here latest half past seven.
 	Trust me, you will need the time to set yourself up. And then every Friday if it works out."'
 
 	killvar 'offset'

+ 6 - 6
locations/natbel_chat.qsrc

@@ -820,11 +820,11 @@ if $ARGS[0] = 'job_questions_runner':
 													'Natasha slowly regains her composure. "Oh yes <<$pcs_nickname>>! I''d love that! Thank you so much." She pauses then gives you a big hug then jumps up.'
 													'"One second <<$pcs_nickname>>, I''ll be back in a moment. Just need to go to the kitchen quickly. I left something on the stove and it should be cooked by now..."'
 													'Natasha returns still holding a wooden spoon and sits next to you so you continue.'
-													'Shall we go Saturday and we can have a look in some of the shops and maybe see if there''s anything we like? How about I pick you up outside between 12:00 and 2:00PM? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
+													'Shall we go Saturday and we can have a look in some of the shops and maybe see if there''s anything we like? How about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
 													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
 													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
 													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
-													'"Okay... So how about I pick you up outside between 12:00 and 2:00PM in two weeks? "'
+													'"Okay... So how about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' in two weeks? "'
 
 													killvar 'temp_city_work'
 													killvar 'temp_pav_work'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'job_questions_runner':
 													*clr & cla
 													minut += 5
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha33.jpg"></center>'
-													'"Anyway... As I was saying, I''ve been thinking about what we can do next. So if we arrange a trip to St. Petersburg Saturday we can have a look in some of the shops and maybe see if there''s anything we like. So how about I pick you up outside between 12:00 and 2:00PM? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
+													'"Anyway... As I was saying, I''ve been thinking about what we can do next. So if we arrange a trip to St. Petersburg Saturday we can have a look in some of the shops and maybe see if there''s anything we like. So how about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
 													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
 													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
 													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
@@ -861,7 +861,7 @@ if $ARGS[0] = 'job_questions_runner':
 														*clr & cla
 														minut += 5
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha41.jpg"></center>'
-														'"Of course Natasha, no problem, how about I pick you up outside between 12:00 and 2:00PM in two weeks." You pause then continue. "Just make sure it doesn..."'
+														'"Of course Natasha, no problem, how about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' in two weeks." You pause then continue. "Just make sure it doesn..."'
 														'Natasha interrupts. "Yes <<$npc_nickname[''A29'']>>!" She says grinning and rolling her eyes.'
 														'"You cheeky mere! If you keep that up you''re asking for a butt slap!" You respond laughing.'
 														'Natasha laughs and stands up then slowly lifts her dress higher and higher exposing her butt and green panties.'
@@ -898,9 +898,9 @@ if $ARGS[0] = 'job_questions_natbel_returns':
 		'Natasha returns still holding a wooden spoon as you continue.'
 
 		if arrsize('temp_pav_work') > 0:
-			'"Anyway... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like? How about I pick you up outside between 12:00 and 2:00PM?"'
+			'"Anyway... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like? How about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'?"'
 		elseif arrsize('temp_city_work') > 0:
-			'"Okay... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like. Whilst we''re there I''ll tell you where I work. So how about I pick you up outside between 12:00 and 2:00PM? "'
+			'"Okay... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like. Whilst we''re there I''ll tell you where I work. So how about I pick you up outside between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'? "'
 		end
 
 		'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'

+ 10 - 10
locations/nerd_game_night.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'invite':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'"Sure, I can make it on <<$week[val(mid(nerd_game[''lot''], 1, 1))]>>," you reply.'
-			'He looks excited. "Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
+			'He looks excited. "Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the library then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
 		act '<<$week[val(mid(nerd_game[''lot''], 2, 1))]>>':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'invite':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'"Sure, I can make it on <<$week[val(mid(nerd_game[''lot''], 2, 1))]>>," you reply.'
-			'He looks excited. "Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''], 2, 1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
+			'He looks excited. "Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''], 2, 1))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the library then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
 	end
@@ -1541,11 +1541,11 @@ if $ARGS[0] = 'summer_invite_sms':
 
 		$SMSTree['ca1'] = '<<$week[val(mid(nerd_game[''lot''],1,1))]>>'
 			$SMSTree['a1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],1,1))]>>.'
-				$SMSTree['a2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+				$SMSTree['a2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
 		$SMSTree['cb1'] = '<<$week[val(mid(nerd_game[''lot''],2,1))]>>'
 			$SMSTree['b1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
-				$SMSTree['b2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],2,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+				$SMSTree['b2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],2,1))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
 		$SMSTree['cc1'] = 'Not this week'
 			$SMSTree['c1'] = 'Sorry I don''t have time this week, but next week I should be able too.'
@@ -1647,11 +1647,11 @@ if $ARGS[0] = 'summer2_invite_sms':
 
 		$SMSTree['ca1'] = 'Tuesday'
 			$SMSTree['a1'] = 'Sure, I can make it on Tuesday.'
-				$SMSTree['a2'] = ':-) Great! I''ll see you on Tuesday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+				$SMSTree['a2'] = ':-) Great! I''ll see you on Tuesday at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
 		$SMSTree['cb1'] = 'Thursday'
 			$SMSTree['b1'] = 'Sure, I can make it on Thursday.'
-				$SMSTree['b2'] = ':-) Great! I''ll see you on Thursday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+				$SMSTree['b2'] = ':-) Great! I''ll see you on Thursday at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
 		$SMSTree['cc1'] = 'Not this week'
 			$SMSTree['c1']  = 'Sorry I don''t have time this week, but next week I should be able too.'
@@ -1799,7 +1799,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'"Sure, I can make it on Tuesday," you reply.'
-			'He looks excited. "Great! I''ll see you on Tuesday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
+			'He looks excited. "Great! I''ll see you on Tuesday at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
 		act 'Thursday':
@@ -1809,7 +1809,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'"Sure, I can make it on Thursday," you reply.'
-			'He looks excited. "Great! I''ll see you on Thursday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
+			'He looks excited. "Great! I''ll see you on Thursday at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard!" he says with a cheesy wink and double finger point before walking away.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
 	end
@@ -1827,13 +1827,13 @@ if $ARGS[0] = 'crash_gamenight_uni':
 			'As you walk over to their table, everyone freezes and looks your way. When they see you, they relax and go back to playing their game.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Hey <<$pcs_nickname>>! We''re almost done, but it''s not too late to join."'
 			'You smile and shake your head. "I just wanted to talk to one of you is all."'
-			'They all exchange looks and then look back at you as Feofan nods. "Okay. Can it wait until we finish at 11pm?"'
+			'They all exchange looks and then look back at you as Feofan nods. "Okay. Can it wait until we finish at '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'?"'
 			'You sigh and check the time.'
 		else
 			'As you walk over to their table, everyone freezes and looks your way. You can feel the anxious looks from the group sitting around a table that has all sorts of geeky stuff spread across it.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Can we help you?"'
 			'You smile to reassure them that you''re not here to mess with them. "I just wanted to talk to one of you is all."'
-			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Can it wait until we finish at 11pm?"'
+			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Can it wait until we finish at '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+'?"'
 			'You sigh and check the time.'
 		end
 		act 'Wait for game to end': minut = (22-hour) * 60 + 30 & gt 'nerd_game_night', 'nerd_chat'

+ 1 - 1
locations/nichBedroomServant.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		end
 
 	end
-	'You should start preparing breakfast before 7:15 during the week and before 8:15 on weekends.'
+	'You should start preparing breakfast before '+func('time', 'get_time_string', 7, 15, cheatVars['time_format'])+' during the week and before '+func('time', 'get_time_string', 8, 15, cheatVars['time_format'])+' on weekends.'
 
 	if (thinkpreg > 0 or knowpreg > 0) and nichPregnancy = 0:
 		''

+ 3 - 3
locations/nichLivingroom.qsrc

@@ -194,7 +194,7 @@ elseif $ARGS[0] = 'evtGalaTele1':
 		act 'Enter': gt $loc
 	end
 elseif $ARGS[0] = 'breakfast':
-	!! breakfast starts at 7:45 at weekdays and 8:45 at weekends
+	!! breakfast starts at 07:45 at weekdays and 08:45 at weekends
 	!! PC will need at least 30 minutes to prepare breakfast.
 	menu_off = 1 & gs 'stat'
 	nichBreakfLast = daystart
@@ -316,11 +316,11 @@ elseif $ARGS[0] = 'breakfast':
 	elseif nichGentleclubE1 = 0 and nichPerformance >= 60 and $nichStatMsg = '' and (nichRand <= 40 or nichDebug = 1) and nichDebug = 1: 
 		!! TODO: locked until expanded further
 		'The family members are chatting with each other about topics of little interest to you.'
-		'"<<$pcs_nickname>>, I have an important guest tonight. I need you to attend us at 6 pm in my study."'
+		'"<<$pcs_nickname>>, I have an important guest tonight. I need you to attend us at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'in my study."'
 		'"Of course, Master Nicholas." You reply as is expected of you.'
 		nichGentleclubE1 = 1
 		nichGentleclubDayE1 = daystart
-		$nichStatMsg = 'Nicholas requested your presence in his study tonight. Wear your maid uniform and arrive between 17:45 and 18:15.'
+		$nichStatMsg = 'Nicholas requested your presence in his study tonight. Wear your maid uniform and arrive between '+func('time', 'get_time_string', 17, 45, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 15, cheatVars['time_format'])+'.'
 	end
 	
 	act 'Clean up':

+ 5 - 5
locations/nyp_school.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				InvitationToDimkaNYparty = 1
 				'Everyone then slowly makes their way out of the school.'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -259,7 +259,7 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -292,7 +292,7 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -985,7 +985,7 @@ if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 	'Time seems to have flown by as the music suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
-	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 	if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 	'Everyone then slowly makes their way out of the school.'
 	InvitationToDimkaNYparty = 1

+ 1 - 1
locations/office.qsrc

@@ -752,7 +752,7 @@ if $ARGS[0] = 'interview':
 					minut += 60
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
 					'"Yes, I''ll take the job. Thank you very much!" you tell her.'
-					'"Excellent! Here''s your welcome packet. Make sure to come to work wearing the appropriate clothes. Work starts at 9am, but it''s okay to show up as early as 8am. It''s not okay to leave before 5pm, other than to get lunch. If you leave work early, then you won''t be paid for the day." After a few more pleasantries, you gather your stuff and leave.'
+					'"Excellent! Here''s your welcome packet. Make sure to come to work wearing the appropriate clothes. Work starts at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+', but it''s okay to show up as early as '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'. It''s not okay to leave before '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+', other than to get lunch. If you leave work early, then you won''t be paid for the day." After a few more pleasantries, you gather your stuff and leave.'
 					act 'Leave': minut += 15 & gt 'city_center'
 				end
 			else

+ 4 - 4
locations/pav_church.qsrc

@@ -27,9 +27,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/st-nikolas.jpg"></center>'
 	'The church of Saint Nikolas is the only church in Pavlovsk and the tallest building in town. It''s very old, but is well maintained by the worshipers of the parish.'
 	''
-	'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
-	'Vigil is held on Saturdays at 19:00.'
-	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
+	'You can attend confession every weekday between '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' or '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', and on the weekend between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
+	'Vigil is held on Saturdays at '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
+	'The Divine Liturgy is on Sundays between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'.'
 
 	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
 	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'liturgy':
 			*nl
 			'Father Kirill seems to be confused about where the fuss is coming from, but then notices you. You see that even he has heard about your little adventures around town, but at the same time his face doesn’t seem to condemn you. It looks a bit like pity.'
 			*nl
-			'"The church is place for everyone, my beloved children. Even if we sometimes forget, we must try to condemn no one. Think about John 8:10: Jesus once met a woman who had slept with a man who betrayed her trust. She was dragged away by his friends and thrown naked before Jesus. The people had ripped her clothes and humiliated her. He spoke to her: ''Woman'', he said. Not ''slut'', or ''whore'', but woman. He threw His coat over her near-naked body and gave her the sense of dignity she had been promised by the man who betrayed her trust. Jesus did not condemn her, so let us try to not condemn others."'
+			'"The church is place for everyone, my beloved children. Even if we sometimes forget, we must try to condemn no one. Think about John '+func('time', 'get_time_string', 8, 10, cheatVars['time_format'])+': Jesus once met a woman who had slept with a man who betrayed her trust. She was dragged away by his friends and thrown naked before Jesus. The people had ripped her clothes and humiliated her. He spoke to her: ''Woman'', he said. Not ''slut'', or ''whore'', but woman. He threw His coat over her near-naked body and gave her the sense of dignity she had been promised by the man who betrayed her trust. Jesus did not condemn her, so let us try to not condemn others."'
 			*nl
 			'The people in the congregation seem a bit uncomfortable hearing these words. Some look towards you and seem to have trouble looking you in the eye, and those that do look away guiltily. You feel better and it seems the townsfolk might see you in a slightly better light.'
 			act 'Leave the church': gt 'pav_church' , 'service_end'

+ 4 - 4
locations/pav_clinic.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = '':
 				minut += 5
 				gpoliuborka = 1
 				gs 'stat'
-				'You notice a piece of paper on the wall near the entrance to the clinic - it''s a job listing which reads: "Cleaner wanted! One hour per day, any time between 14:00 and 21:00. Payment: 100 <b>₽</b>."'
+				'You notice a piece of paper on the wall near the entrance to the clinic - it''s a job listing which reads: "Cleaner wanted! One hour per day, any time between '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'. Payment: 100 <b>₽</b>."'
 
 				act 'Move away': gt 'pav_clinic'
 			end
@@ -470,7 +470,7 @@ if $ARGS[0] = '':
 		end
 		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0 and func('homes_properties', 'has_access', 'parents_home'): act 'Go to the gynaecologist for a referral': gt 'pav_clinic', 'referral'
 	else
-		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		'The clinic is closed. It''s open every day between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 	end
 end
 
@@ -1573,7 +1573,7 @@ if $ARGS[0] = 'maternity_ward':
 			end
 		end
 	else
-		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		'The clinic is closed. It''s open every day between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 		act 'Leave':minut += 5 & gt 'pav_commercial'
 	end
 end
@@ -1674,7 +1674,7 @@ if $ARGS[0] = 'maternity_ward_donation':
 		'You put your top back on and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
 		act 'Leave': minut += 5 & gt 'pav_commercial'
 	else
-		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		'The clinic is closed. It''s open every day between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 		act 'Leave': minut += 5 & gt 'pav_commercial'
 	end
 end

+ 4 - 4
locations/pav_commcenter.qsrc

@@ -40,10 +40,10 @@ if $ARGS[0] ! 'XXX':
 		end
 	else
 		'The community center has sports facilities and offers classes in the evening.'
-		'It houses a small library which is open from 08:00 until 18:00.'
-		'Upstairs, there are some hobby clubs available from 12:00 until 20:00.'
-		'The sports section is open from 14:00 until 20:00 during the week and from 09:00 until 20:00 during the weekend.'
-		'On Friday and Saturday evenings, from 20:00 to midnight, the main hall is used as a club with popular music and dancing. Entry fee is 25 <b>₽</b>.'
+		'It houses a small library which is open from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
+		'Upstairs, there are some hobby clubs available from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.'
+		'The sports section is open from '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' during the week and from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' until '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' during the weekend.'
+		'On Friday and Saturday evenings, from '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' to midnight, the main hall is used as a club with popular music and dancing. Entry fee is 25 <b>₽</b>.'
 	end
 
 	if month > 8 and ml_guitarlesson['advertisement']  = 0: gt 'music_guitarlesson', 'advertisement'

+ 5 - 5
locations/pav_commercial.qsrc

@@ -89,13 +89,13 @@ if week < 6 and hour >= 9 and hour <= 18:
 elseif week = 6 and hour >= 10 and hour <= 18:
 	$desc_txt4 = '<a href="exec:minut += 3 & gt ''post_office'', ''start''">post office</a>'
 else
-	$desc_txt4 = '<a href="exec:msg ''The post office, which is closed right now, will reopen again at 9:00 and at 10:00 on Saturdays.''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office, which is closed right now, will reopen again at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' on Saturdays.''">post office</a>'
 end
 
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):
 	$desc_txt5 = '<a href="exec:gt ''bank'', ''start''">VTB Bank</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''VTB Bank, which is closed right now. It will reopen again at 9:00''">VTB Bank</a>'
+	$desc_txt5 = '<a href="exec:msg ''VTB Bank, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'''">VTB Bank</a>'
 end
 
 '<br>On the street across from the station is a small <a href="exec:minut += 1 & gt ''pav_clinic''">Avicenna clinic</a>. <<$Pharmname>> The building next door is shared by the local <<$desc_txt4>> and a <<$desc_txt5>>.'
@@ -103,14 +103,14 @@ end
 if hour >= 8 and hour <= 20:
 	$desc_txt3 = '<a href="exec:minut += 2 & gt ''shop'', ''start''">Pyaterochka</a>, a popular discount supermarket chain'
 else
-	$desc_txt3 = '<a href="exec:msg ''Pyaterochka, which is closed right now. It will reopen again at 8:00''">Pyaterochka</a>, a popular discount supermarket chain'
+	$desc_txt3 = '<a href="exec:msg ''Pyaterochka, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Pyaterochka</a>, a popular discount supermarket chain'
 end
 '<br>Of course, right after you visit the bank, you can spend your money at <<$desc_txt3>>.'
 
 if hour >= 8 and hour <= 17:
 	$desc_txt1 = '<a href="exec: minut += 3 & gt ''barbershop'', ''start''">A Cut Above</a>, the only barber shop in the area, <a href="exec: minut += 3 & gt ''shop_coco_carmen'', ''start''">Coco Carmen</a> the trendy clothes shop and <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> the swimwear chain'
 else
-	$desc_txt1 = '<a href="exec:msg ''A Cut Above, which is closed right now. It will reopen again at 8:00''">A Cut Above</a>, the only barber shop in the area, <a href="exec:msg ''Coco Carmen, which is closed right now. It will reopen again at 8:00''">Coco Carmen</a> the trendy clothes shop and <a href="exec:msg ''Allure, which is closed right now. It will reopen again at 8:00''">Allure</a> the swimwear chain'
+	$desc_txt1 = '<a href="exec:msg ''A Cut Above, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">A Cut Above</a>, the only barber shop in the area, <a href="exec:msg ''Coco Carmen, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Coco Carmen</a> the trendy clothes shop and <a href="exec:msg ''Allure, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'''">Allure</a> the swimwear chain'
 end
 '<br>The rest of the street is filled with smaller locally owned businesses, most notable being <<$desc_txt1>>.'
 
@@ -125,7 +125,7 @@ end
 if hour >= 7 and hour <= 18:
 	$desc_txt2 = '<a href="exec:minut += 15 & gt ''etoexhib'', ''pos20''">vocational school</a>, where young adults can learn a trade.'
 else
-	$desc_txt2 = '<a href="exec:msg ''vocational school, which is closed right now. It will reopen again at 7:00''">vocational school</a>.'
+	$desc_txt2 = '<a href="exec:msg ''vocational school, which is closed right now. It will reopen again at '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'''">vocational school</a>.'
 end
 
 '<br>If you continue past the shops, you''ll eventually find a <<$desc_txt2>>'

+ 6 - 6
locations/pav_factory.qsrc

@@ -57,8 +57,8 @@ if $ARGS[0] = 'enter':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/pav_factory.jpg" ></center>'
 	'You''re standing inside the building accommodating the biggest employer in Pavlovsk, the local textile factory.'
 	'There is a work schedule hanging on the wall:'
-	'First shift - 08:00 to 16:00.'
-	'Second shift - 16:00 to 20:00.'
+	'First shift - '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.'
+	'Second shift - '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.'
 	*nl
 	if workFabrika = 0 and age < 18:'You can apply for a <a href="exec:minut += 15 & gt ''pav_factory'', ''job_start''">part-time job</a> here.'
 	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & gt ''pav_factory'', ''job_start''">full-time job</a> here.'
@@ -111,7 +111,7 @@ if $ARGS[0] = 'job_start':
 	act 'Leave': gt'pav_factory', 'enter'
 
 	if age < 18 and workFabrika = 0:
-		'"Sure, have a seat," he says. "Now, the work is complex and meticulous but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult, you can only work part-time, and the pay is <b>₽</b>150 per hour. Once you become an adult, we can transfer you to full-time. As this is a state-recognized company, we require all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, but you will be working the second shift from 16:00 to 20:00.'
+		'"Sure, have a seat," he says. "Now, the work is complex and meticulous but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult, you can only work part-time, and the pay is <b>₽</b>150 per hour. Once you become an adult, we can transfer you to full-time. As this is a state-recognized company, we require all the appropriate documentation. The main shift is on weekdays from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+', but you will be working the second shift from '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.'
 		'But beware, you will be fired if you miss more than three days of work in a single month. You will be paid at the end of the month, and getting fired before then will forfeit any pay yet to be received. So, is that okay?"'
 
 		act 'Accept the job':
@@ -122,13 +122,13 @@ if $ARGS[0] = 'job_start':
 			workFabrika = 1
 			smenaFabrika = 0
 			FabrikaProgul = 0
-			'You hand him over your documents, which he takes, and then he reminds you to come in every weekday at 16:00.'
+			'You hand him over your documents, which he takes, and then he reminds you to come in every weekday at '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'.'
 
 			act 'Leave': gt'pav_factory', 'enter'
 		end
 
 	elseif age >= 18 and workFabrika = 0:
-		'"Sure, have a seat," he says, pointing to a wooden chair in front of his desk. "Now, the work is complex and meticulous but doesn''t require any special knowledge. You should catch on pretty quick. As this is a state-recognized company, we need all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, and the pay is <b>₽</b>105 per hour.'
+		'"Sure, have a seat," he says, pointing to a wooden chair in front of his desk. "Now, the work is complex and meticulous but doesn''t require any special knowledge. You should catch on pretty quick. As this is a state-recognized company, we need all the appropriate documentation. The main shift is on weekdays from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+', and the pay is <b>₽</b>105 per hour.'
 		'But beware, you will be fired if you miss more than three days of work in a single month. You will be paid at the end of the month, and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
 
 		act 'Accept the job':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'job_start':
 			workFabrika = 1
 			smenaFabrika = 0
 			FabrikaProgul = 0
-			'You hand him your documents, which he takes, and he then reminds you to come in every weekday at 08:00.'
+			'You hand him your documents, which he takes, and he then reminds you to come in every weekday at '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'.'
 
 			act 'Leave': gt'pav_factory', 'enter'
 		end

+ 2 - 2
locations/pav_hotelAdmin.qsrc

@@ -18,7 +18,7 @@ if GotelWork = 0 and germanqw<2:
 		'You approach the man''s desk, but he doesn''t look up from his work. With a soft voice you carefully try to get his attention: "Umm... excuse me?"'
 		'He looks up from his desk: "Oh I''m sorry, I didn''t hear you come in. Hello, I''m Herman Leonidovich, manager of this hotel. Is there a problem?"'
 		'You smile and shake your head: "No, no problem. I am looking for a job, I hear you are often looking for maids?"'
-		'You can feel his eyes exploring your body for a moment before he responds: "Yes, we are! We currently only have a part-time vacancy, for a maid. You would be working between 16:00 and 19:00, give or take. Most of the hotel rooms are empty then, before the new guests come in. You can work any day you like, no pressure. It would pay 375 <b>₽</b> per shift. After your work, you can immediately go collect your salary at the reception, or you can save it up and collect it all at once later. Does that sound good to you?"'
+		'You can feel his eyes exploring your body for a moment before he responds: "Yes, we are! We currently only have a part-time vacancy, for a maid. You would be working between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+', give or take. Most of the hotel rooms are empty then, before the new guests come in. You can work any day you like, no pressure. It would pay 375 <b>₽</b> per shift. After your work, you can immediately go collect your salary at the reception, or you can save it up and collect it all at once later. Does that sound good to you?"'
 		act'"That sounds great!"':
 			cla
 			*clr
@@ -31,7 +31,7 @@ if GotelWork = 0 and germanqw<2:
 			'Herman gives you a friendly smile, happy to have found another potential worker. He quickly writes some of your personal data down.'
 			'Then he says: "Oh by the way, two more things: you will be required to wear a maid uniform during your working hours. Don''t worry, we have them right here. You can change before you start your shift, and your own stuff will be safe in a locker."'
 			'You nod: "Sounds fair... what''s the other thing?"'
-			'Herman continues: "If you want to work a shift, you need to be here between 16:00 and 17:00. There''s no point in you getting changed for just 20 minutes of work."'
+			'Herman continues: "If you want to work a shift, you need to be here between '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'. There''s no point in you getting changed for just 20 minutes of work."'
 			'"That also sounds fair." You give him a handshake as you get ready to leave: "Okay. Thank you sir!"'
 			act 'Return to the lobby': gt'pav_hotel'
 		end

+ 1 - 1
locations/pav_hotelReception.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = '':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'You approach the reception desk, and ask the girl: "Excuse me... I hear you are often looking for maids? I would like to come work as a maid here."'
-			'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
+			'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'. I bet he will hire you! Good luck when you go see him!"'
 
 			act 'Step away from the reception desk':gt 'pav_hotel', 'skip_resepevent'
 		end

+ 1 - 1
locations/pav_hotelWork.qsrc

@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'maid':
 									'Not able to say anything in your defense and being afraid she might get you fired, you remain silent.'
 									'"You know I should charge you for watching. I don''t do many shows nowadays but I know I''m good and how much they cost." She says whilst smiling.'
 									'You quickly try to come up with an excuse, "I-I..." you stammer.'
-									iif(LariskaQW['metAnna'] = 1, 'Anna', 'The brunette')+' looks at you, "I understand. You are worried about your work. Don''t be I won''t tattle-tale on you. Let us agree on something, if you want to find out more, maybe get to understand what it is I do or just find somewhere you can watch these things, come and visit me in this room, at 20:00 Monday or Tuesday."'
+									iif(LariskaQW['metAnna'] = 1, 'Anna', 'The brunette')+' looks at you, "I understand. You are worried about your work. Don''t be I won''t tattle-tale on you. Let us agree on something, if you want to find out more, maybe get to understand what it is I do or just find somewhere you can watch these things, come and visit me in this room, at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' Monday or Tuesday."'
 									if LariskaQW['metAnna'] = 0:
 										 LariskaQW['metAnna'] = 1
 										'By the way I am Lariska''s mum. I have seen you at the school." You blush deeply at this revelation.'

+ 4 - 4
locations/pav_industrial.qsrc

@@ -37,10 +37,10 @@ elseif hour < 8 or hour > 20 or week > 5:
 	'The factory is currently closed.'
 end
 'Opening hours are Monday through Friday:'
-'First shift - 08:00 to 16:00'
-'Second shift - 16:00 to 20:00'
+'First shift - '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+''
+'Second shift - '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+''
 *nl
-'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''pav_factory'', ''tailor''">tailor</a>', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 17:00.'
+'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''pav_factory'', ''tailor''">tailor</a>', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.'
 
 gs 'street_event', 'pav_industrial', 'extras'
 
@@ -67,7 +67,7 @@ end
 if week < 7 and hour >= 8 and hour < 20:
 	*pl 'The local <a href="exec:torg = 0 & gt ''shop_gm'',''start''">G&M Store</a> is currently open.'
 else
-	*pl 'The local G&M store is currently closed. Opening hours are Monday to Saturday, between 08:00 to 20:00.'
+	*pl 'The local G&M store is currently closed. Opening hours are Monday to Saturday, between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+'.'
 end
 
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'

+ 1 - 1
locations/pav_pool.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 	else
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
-		'The swimming pool is currently closed. Opening hours are from 08:00 to 21:00.'
+		'The swimming pool is currently closed. Opening hours are from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
 		act 'Leave': gt 'pav_residential'
 	end
 end

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -545,7 +545,7 @@ if $ARGS[0] = 'kitchen':
 	'<center><h3>Kitchen</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 	'It''s a modest kitchen, but has all that is needed.'
-	'You can cook breakfast for the guys between 6:00 and 7:00 and dinner for them between 18:00 and 19:00'
+	'You can cook breakfast for the guys between '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+' and dinner for them between '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+''
 
 	! dishes
 	if mc_inventory['dish_plates'] > 0:

+ 8 - 8
locations/pav_train_hall.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = '':
 	*nl
 	'Stepping into the station building you are greated by a large waiting room, where passengers await the trains. In one of the corners you can clearly see the <a href="exec: gt ''pav_train_hall_events'', ''manager''">station manager''s office</a>. The <a href="exec:minut += 1 & gt ''pav_train_hall'', ''toilet''">toilets</a> are located farthest back of the building.'
 	*nl
-	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
+	'The long-distance trains are at the station platforms between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 11, 30, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+'.'
 	*nl
 
 	*nl
@@ -96,22 +96,22 @@ if $ARGS[0] = '':
 	*nl
 	if hour = 11 and minut = 0:
 		poezddalsled = 1
-		'The 11:30 long-distance train is currently approaching the platform.'
+		'The '+func('time', 'get_time_string', 11, 30, cheatVars['time_format'])+' long-distance train is currently approaching the platform.'
 	elseif hour = 11 and minut > 0 and minut < 30:
 		poezddalsled = 1
-		'The 11:30 long-distance train is currently waiting at the platform.'
+		'The '+func('time', 'get_time_string', 11, 30, cheatVars['time_format'])+' long-distance train is currently waiting at the platform.'
 	elseif hour = 11 and minut = 30:
 		poezddalsled = 1
-		'The 11:30 long-distance train is currently leaving the station.'
+		'The '+func('time', 'get_time_string', 11, 30, cheatVars['time_format'])+' long-distance train is currently leaving the station.'
 	elseif hour = 18 and minut = 0:
 		poezddalsled = 1
-		'The 18:30 long-distance train is currently approaching the platform.'
+		'The '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+' long-distance train is currently approaching the platform.'
 	elseif hour = 18 and minut > 0 and minut < 30:
 		poezddalsled = 1
-		'The 18:30 long-distance train is currently waiting at the platform.'
+		'The '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+' long-distance train is currently waiting at the platform.'
 	elseif hour = 18 and minut = 30:
 		poezddalsled = 1
-		'The 18:30 long-distance train is currently leaving the station.'
+		'The '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+' long-distance train is currently leaving the station.'
 	end
 
 	if poezddalsled = 1:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'platform':
 	'<center><h2>Pavlovsk station platforms</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 	*nl
-	'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
+	'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 11, 30, cheatVars['time_format'])+', and between '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+' when the long-distance trains are ready for boarding.'
 	*nl
 	gs 'transport_functions', 'set_train_wait_time', 'pavlovsk'
 	'The next train in the direction of St. Petersburg city center ' + iif(temp_transportVars['train_wait_center'] = 0, 'is leaving now!', 'leaves in <<temp_transportVars[''train_wait_center'']>> minutes.')

+ 3 - 3
locations/pav_train_hall_events.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'manager':
 	gs 'stat'
 	'As you walk past the station manager''s office, you notice a sign next to the door:'
 	'"Cleaner wanted! 2 hours per day at any time, salary 250 <b>₽</b>. Ask the station manager for more information."'
-	'"Office visiting hours: 08:00 - 17:00"'
+	'"Office visiting hours: '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'"'
 
 	act 'Return to the train station':minut += 1 & gt 'pav_train_hall'
 
@@ -310,7 +310,7 @@ if $ARGS[0] = 'vera':
 									'Vera gets a slight blush on her face as she continues: "I... did what I always did for Leszek, I dropped to my knees and took it in my mouth like he wanted me to. I pretended his friend wasn''t there with us, and just focused on making Leszek feel good. His friend watched for a moment, and then asked if he could join. Leszek told him it was okay, and without even asking me his friend pulled his pants down and pushes his dick against my lips, telling me to suck him too."'
 									*nl
 									'"I did. It felt strange having two dicks in my mouth at once, but Leszek liked it and kept encouraging me, telling me what a great little slut I was for him. Then we did all sorts of positions... first Leszek put me on my hands and knees and fucked my ass like he always did, while I was sucking his friend... then they double penetrated me, and after that they both put their dicks in my ass at once! When they both ended on my face, Leszek told me to leave it there for a minute. He told me what a huge whore I was, and that I shouldn''t fight my true nature and just embrace it."'
-									'"They continued fucking me throughout that whole night, it was 4AM by the time they were spent. Leszek liked it so much, that he kept inviting his friend over from then on. The following years Leszek would invite him more and more often, and they''d both fuck me any way they pleased. Towards the end, they were spitroasting and double penetrating me every day."'
+									'"They continued fucking me throughout that whole night, it was '+func('time', 'get_time_string', 4, 0, cheatVars['time_format'])+' by the time they were spent. Leszek liked it so much, that he kept inviting his friend over from then on. The following years Leszek would invite him more and more often, and they''d both fuck me any way they pleased. Towards the end, they were spitroasting and double penetrating me every day."'
 									'Vera almost tears up when she says: "Then that bastard graduated! Leszek was one year ahead of me. He went to the United Kingdom, without even saying goodbye when he left the country! I haven''t seen him since. I felt so alone... Leszek was the love of my life, I couldn''t believe he would just abandon me like that."'
 
 									act '"Two guys at once? You slut!"':
@@ -526,7 +526,7 @@ if $ARGS[0] = 'vera':
 			'You approach the cashier and, not sure how to start the conversation, you ask her how long she''s been working at the Pavlovsk station.'
 			'She smiles as she replies: "Oh... a few years now. What about you, girl? Why are you working as a cleaner here?"'
 			'You look sad for a moment and tell her about your lack of money: "Times are tough, you know... working here doesn''t pay very well, but in this economy I have to take what I can get."'
-			'She nods, fully understanding your problem. Then her eyes light up: "Oh! You know how there are long-distance trains arriving at the station at 11:00 and 18:00 every day? The station is always packed with tourists then, I bet you could make some good money selling trinkets and baubles to them!"'
+			'She nods, fully understanding your problem. Then her eyes light up: "Oh! You know how there are long-distance trains arriving at the station at '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' every day? The station is always packed with tourists then, I bet you could make some good money selling trinkets and baubles to them!"'
 			'When she notices your interest she continues: "There is a warehouse terminal in the city industrial district, you can buy items there that tourists will like. You can sell them at the station for a good profit... just make sure the police don''t see you, they don''t like it when you sell things without a permit!"'
 			'This sounds interesting! You thank her: "Thanks for the tip, maybe I will! By the way, my name is <<$pcs_nickname>>."'
 			'She smiles as she replies: "Vera Tsarev, pleased to meet you. I have to get back to work now, I''ll be seeing you around!"'

+ 1 - 1
locations/pav_train_market.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'start':
 			gt 'pav_train_market', 'clo'
 		end
 	else
-		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
+		'The market stalls are empty. The market is only open between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+'.'
 		act 'Leave the market': minut += 3 & gt 'pav_market'
 	end
 end

+ 2 - 2
locations/pirsingsalon.qsrc

@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'tattoo_ass':
 		ps_total = func('tattoo_management', 'totals', 'ass')
 		ps_i = 1
 		:looptatass
-			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_ass'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''ass_image'', ps_i)>>"></a>'
+			*p '<a href="exec: gt ''pirsingsalon'', ''tattoo_ass2'', <<ps_i>>"><img height="250" src="<<func(''tattoo_management'', ''ass_image'', ps_i)>>"></a>'
 			ps_i += 1
 		if ps_i <= ps_total: jump 'looptatass'
 
@@ -1837,7 +1837,7 @@ if $ARGS[0] = 'tattoo_wrist2':
 	act 'Return': gt 'pirsingsalon', 'tattoo_wrist'
 end
 
-if $ARGS[0] = 'tattoo_wrist2':
+if $ARGS[0] = 'tattoo_wrist3':
 	minut += 60
 	if $ARGS[2] = 'money': money -= 12000 else karta -= 12000
 	gs 'tattoo_management', 'add', 'wrist', ARGS[1]

+ 2 - 2
locations/pornstudio.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave': gt 'city_redlight', 'start'
 	if hour < 10 or hour > 22:
-		'The porn studio is currently closed. It is open between 10:00 and 22:00.'
+		'The porn studio is currently closed. It is open between '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+'.'
 		exit
 	end
 
@@ -422,7 +422,7 @@ if $ARGS[0] = 'manager':
 				pornstack += 1
 				pfilmday[1] = 1
 				gs 'stat'
-				'"Cool. We shoot tomorrow, so be here between 10:00 and 11:00. Please don''t be late."'
+				'"Cool. We shoot tomorrow, so be here between '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+'. Please don''t be late."'
 
 				act 'Leave': gt 'pornstudio', 'start'
 			end

+ 10 - 10
locations/post_deliveries.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 		'You pick up the bag and get ready to start your round.'
 	else
 		'"We''re swamped today, so I hope you''re wearing your running shoes!" he smirks. You can tell he feels bad for giving you so much work, but still expects you to get it done on time.'
-		'Your bag is so heavy that you have to carry it with both hands. You might have to use some shortcuts if you want to make it back by 15:00!'
+		'Your bag is so heavy that you have to carry it with both hands. You might have to use some shortcuts if you want to make it back by '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'!'
 	end
 	'You take some time to get ready for your round, checking all the addresses and planning a route before leaving the post office around noon to get started.'
 
@@ -47,14 +47,14 @@ if $ARGS[0] = 'start':
 		'The first half hour is easy as you work your way through the streets near the post office. As you get further away from the center, you take a look in your bag and ponder how you''re going to handle your round today.'
 		if postamountrand = 0:
 			minut += 25
-			'Your bag feels fairly light, and you don''t see that many items left in it. You could easily make it back before 15:00, and would even have time to relax and take breaks!'
+			'Your bag feels fairly light, and you don''t see that many items left in it. You could easily make it back before '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+', and would even have time to relax and take breaks!'
 		elseif postamountrand = 1:
 			minut += 35
 			'Your bag is still fairly full, and you''ll have to keep walking at a brisk pace to make it back on time. Nevertheless, you don''t think you would need to take any risks in the more dangerous streets.'
 		else
 			minut += 45
 			'Your bag still feels very full, and you realize there''s no way you''ll make it back on time if you stick to the predetermined route! Cutting through certain streets might be dangerous though...'
-			'You could stick to the safe roads, but the postmaster won''t like you returning late. Alternatively, you could push your luck and hopefully get all your deliveries done by 15:00 by cutting through areas where you might get into trouble.'
+			'You could stick to the safe roads, but the postmaster won''t like you returning late. Alternatively, you could push your luck and hopefully get all your deliveries done by '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+' by cutting through areas where you might get into trouble.'
 		end
 
 		act 'Stick to the safe route':
@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 			if postamountrand = 0:
 				'You have more than enough time to finish your round, even with you taking it slowly.'
 			elseif postamountrand = 1:
-				'You figure you have enough time to stick to your predetermined route and be done on time, so that''s what you do. You won''t have time to stop for anything or talk to anyone for very long, but will finish just around 15:00 as expected.'
+				'You figure you have enough time to stick to your predetermined route and be done on time, so that''s what you do. You won''t have time to stop for anything or talk to anyone for very long, but will finish just around '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+' as expected.'
 			else
 				'After another half hour, you take another look in your bag and see that there''s still a lot to deliver! There''s no way you''ll be able to finish your round on time if you keep this up.'
 			end
@@ -344,7 +344,7 @@ if $ARGS[0] = '3':
 			end
 			act 'Say you''ll be back when you''re done':
 				cla
-				'"Deal. I''ll come back once I''m done," you reply. "I should be done around 15:00."'
+				'"Deal. I''ll come back once I''m done," you reply. "I should be done around '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'."'
 				'"Heh... I can''t wait. I have a feeling we''re going to be good friends," he grins as he signs for his parcel. "See you then."'
 				act 'Continue your round': gt 'post_deliveries', 'resume'
 			end
@@ -437,7 +437,7 @@ if $ARGS[0] = '5':
 	'When you walk past them, one of them greets you. "Excuse me? Hi! We''re not from here, we''re just visiting for the weekend. Would you like to sit down and hang out with us for a while? You look like you could use a break!"'
 	'Another guy pitches in. "We were hoping you could point us to some interesting things to do around here? We got rooms for the whole weekend, but besides the palace this place seems pretty boring!"'
 	if postamountrand = 0: 'You cast a quick glance at your phone and realize you have some time to spare.'
-	if postamountrand = 1: 'You cast a quick glance at your phone and realize you''d roughly be back at the post office by 15:00. You can''t stick around for too long though...'
+	if postamountrand = 1: 'You cast a quick glance at your phone and realize you''d roughly be back at the post office by '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'. You can''t stick around for too long though...'
 	if postamountrand = 2: 'You cast a quick glance at your phone and realize you''re already behind schedule. You should probably keep going...'
 	''
 	if postamountrand = 0:
@@ -991,11 +991,11 @@ if $ARGS[0] = 'resume':
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
 		'You deliver the last few pieces of mail without anything of note happening, and nod contently to yourself after you hand off the last parcel. You''re all done for the day.'
 		if hour < 15:
-			'You check the time and see that it''s not even 15:00 yet. The postmaster will be pleased!'
+			'You check the time and see that it''s not even '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+' yet. The postmaster will be pleased!'
 		elseif hour = 15 and minut <= 15:
-			'You check the time and see it''s around 15:00 still. You''re done just in time to not get into trouble! Phew...'
+			'You check the time and see it''s around '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+' still. You''re done just in time to not get into trouble! Phew...'
 		else
-			'You check the time and see it''s already well past 15:00. The postmaster won''t be happy...'
+			'You check the time and see it''s already well past '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'. The postmaster won''t be happy...'
 		end
 		act 'Return to the post office': gt 'post_deliveries', 'finishround'
 	end
@@ -1384,7 +1384,7 @@ if $ARGS[0] = 'finishround':
 			'When you nod, his stern expression softens a little. "Well... alright then," he says, still a bit reluctant. "It''s important people get their mail on time, though. Don''t make a habit of it!"'
 		elseif postlate >= 12 and postlate < 15:
 			'"You''re late yet again!" the postmaster scoffs when you enter the post office, but your remark that you delivered everything falls on deaf ears.'
-			'"I don''t care! Everyone knows that mail is delivered before 15:00! You may be getting lucky with people still being home after that, but your luck won''t last," he remarks, mumbling something about how you make the postal service look bad before his voice grows louder. "I will not stand for this! If you''re late one more time, you''re fired! You hear me?"'
+			'"I don''t care! Everyone knows that mail is delivered before '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'! You may be getting lucky with people still being home after that, but your luck won''t last," he remarks, mumbling something about how you make the postal service look bad before his voice grows louder. "I will not stand for this! If you''re late one more time, you''re fired! You hear me?"'
 			'Knowing it''s no use arguing, you just nod.'
 		else
 			postjobQW = 999

+ 15 - 15
locations/post_master.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 			'"A job? I haven''t got any jobs," he shrugs.'
 			'Just as you''re about to turn around to leave, he stops you. "Actually, Aleksiy has been mentioning he wants to spend more time with his sick daughter on weekends. Maybe... Come back here, girl."'
 			'He takes another good look at you and seems to be in deep thought for a moment before humming contently.'
-			'"Alright, I''ll give you a chance to prove yourself. You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 500 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week," he offers.'
+			'"Alright, I''ll give you a chance to prove yourself. You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 500 <b>₽</b> total, for about three hours of work - from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to roughly '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'. If you do well, you can do it every week," he offers.'
 			
 			act 'Decline':
 				cla
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 				cla
 				postjobQW = 2
 				'"That sounds great, thank you!" you smile.'
-				'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out. Our post office has a damn near perfect record for deliveries, and I intend to keep it that way!"'
+				'"<b>Meet me here on Saturday, between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out. Our post office has a damn near perfect record for deliveries, and I intend to keep it that way!"'
 				'He quickly records your personal information and sends you on your way before returning to work.'
 				act 'Leave him alone': gt 'post_office', 'start'
 			end	
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 		'"Wait... Weren''t you here before?" he asks when he sees your face. "Right, you were here about that Saturday job! It''s still available if you want it?"'
-		'When you ask him about the details, he reminds you. "You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 500 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week."'
+		'When you ask him about the details, he reminds you. "You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 500 <b>₽</b> total, for about three hours of work - from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to roughly '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'. If you do well, you can do it every week."'
 		
 		act 'Decline':
 			cla
@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 			cla
 			postjobQW = 2
 			'"That sounds great, thank you!" you smile'
-			'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out! Our post office has a damn near perfect record for deliveries, and I intend to keep it that way!"'
+			'"<b>Meet me here on Saturday, between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out! Our post office has a damn near perfect record for deliveries, and I intend to keep it that way!"'
 			'He then nods you off, before returning to his work.'
 			act 'Leave him alone': gt 'post_office', 'start'
 		end	
@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Ah good, you''re here!" the postmaster smiles when you enter the post office. "And right on time too! Please follow me."'
 			'He guides you to the back room where a number of small packages and letters are packed into a bag.'
-			'"The addresses are all fairly nearby. It might look like a lot, but you should be done by 15:00," he reassures you. "It''s simple: bring the mail to where it needs to be, have them sign on this sheet, and bring back the mail you couldn''t deliver for whatever reason."'
+			'"The addresses are all fairly nearby. It might look like a lot, but you should be done by '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'," he reassures you. "It''s simple: bring the mail to where it needs to be, have them sign on this sheet, and bring back the mail you couldn''t deliver for whatever reason."'
 			'He continues on for a while longer about the rules, but they seem rather self-explanatory and you don''t pay close attention to what he''s saying.'
 			'"Oh, before I forget: you might want to avoid certain streets," he warns you. "I''ve marked them on this map. You wouldn''t be the first to get robbed by hoodlums hoping to find something valuable in the packages. And you wouldn''t be the first to get a beating when there''s nothing of value in your bag. Anyway, avoid these areas and you should be fine."'
 			'He hands you a map with a bunch of streets and plazas marked out. He has drawn out the best route to take today too.'
@@ -91,7 +91,7 @@ if $ARGS[0] = 'start':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 					'He warned you for a reason, so you think it best to play it safe, especially on your first day.'
-					'You stick to the route he suggested and have a fairly uneventful day delivering the rest of your mail. You return to the post office just before 15:00.'
+					'You stick to the route he suggested and have a fairly uneventful day delivering the rest of your mail. You return to the post office just before '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 					'"You managed to deliver all of it? That''s great!" the postmaster beams as you put the empty bag back where it belongs.'
 					'He hands you your pay right away, with another 50 <b>₽</b> extra. "From Aleksiy. He says thanks for his first Saturday off in months! He and his little girl dropped by earlier and he looked so happy!" he explains. "As far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 					
@@ -109,7 +109,7 @@ if $ARGS[0] = 'start':
 						postjobQW = 4
 						'You tell him you want to work again next Saturday.'
 						'"That''s great! In that case, I''ll let Aleksiy know he no longer has to come in on weekends. See you next week!" he says while shaking your hand. "And thank you for a job well done!"'
-						'You can now deliver mail every Saturday from 12:00 to 15:00.'
+						'You can now deliver mail every Saturday from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 						act 'Leave the postmaster''s office': gt 'post_office', 'start'
 					end
 				end
@@ -123,7 +123,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 						'You walk by yet another empty street and look at your map again. Deciding to ignore the risk, you head down one of the streets marked as dangerous.'
 						'You sometimes feel a little uncomfortable when small groups of rowdy looking guys are checking you out, but fortunately they leave you alone and your bag is empty in no time at all.'
-						'You''re done almost an hour faster than planned, and it''s only 14:10 when you return to the postmaster.'
+						'You''re done almost an hour faster than planned, and it''s only '+func('time', 'get_time_string', 14, 10, cheatVars['time_format'])+' when you return to the postmaster.'
 						'He gives you a suspicious look and shakes his head. "There''s no way you''d be back already if you listened to what I said. You ignored my warning, didn''t you?"'
 						
 						act 'Be honest':
@@ -141,7 +141,7 @@ if $ARGS[0] = 'start':
 								minut += 2
 								gs 'stat'
 								'"I don''t know how next week will look yet. Can I think about it?" you ask.'
-								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday 18:00, I will assume you''re not coming."'
+								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', I will assume you''re not coming."'
 								'You nod understandingly. "That sounds fair. I''ll come and tell you once I''ve made my decision."'
 
 								act 'Leave the postmaster''s office': gt 'post_office', 'start'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								'You tell him you want to work again next Saturday.'
 								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says while shaking your hand. "And thank you for a job well done!"'
-								'You can now deliver mail every Saturday from 12:00 to 15:00.'
+								'You can now deliver mail every Saturday from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 								act 'Leave the postmaster''s office': gt 'post_office', 'start'
 							end
 
@@ -174,7 +174,7 @@ if $ARGS[0] = 'start':
 								minut += 2
 								gs 'stat'
 								'"I don''t know how next week will look yet. Can I think about it?" you ask.'
-								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday 18:00, I will assume you''re not coming."'
+								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+', I will assume you''re not coming."'
 								'You nod understandingly. "That sounds fair. I''ll come and tell you once I''ve made my decision."'
 
 								act 'Leave the postmaster''s office': gt 'post_office', 'start'
@@ -186,7 +186,7 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								'You tell him you want to work again next Saturday.'
 								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says while shaking your hand. "And thank you for a job well done!"'
-								'You can now deliver mail every Saturday from 12:00 to 15:00.'
+								'You can now deliver mail every Saturday from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 
 								act 'Leave the postmaster''s office': gt 'post_office', 'start'
 							end
@@ -204,7 +204,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'The postmaster looks at you in confusion, wondering why you''re here. "Yes? More questions? You look like you want to ask something..."'
 			'"Could you tell me about the job again?" you ask.'
-			'He nods. "Of course. As you probably know, Russian Post doesn''t deliver regular mail on Saturdays, only priority mail. That''s what you will be delivering. Not a lot of mail, but if people choose to have it delivered on Saturdays, it must be important! It''s a big responsibility, but I trust you to get the job done. It''ll take you roughly three hours, going on past experience. Some days we have more, some days we have less. <b>Make sure you''re here between 11:00 and 12:00 on Saturday, so I can talk you through what exactly it is you have to do.</b>"'
+			'He nods. "Of course. As you probably know, Russian Post doesn''t deliver regular mail on Saturdays, only priority mail. That''s what you will be delivering. Not a lot of mail, but if people choose to have it delivered on Saturdays, it must be important! It''s a big responsibility, but I trust you to get the job done. It''ll take you roughly three hours, going on past experience. Some days we have more, some days we have less. <b>Make sure you''re here between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' on Saturday, so I can talk you through what exactly it is you have to do.</b>"'
 			'He watches you for a second while you try to memorize it all. "Was that all? I really need to get back to work..." he says somewhat impatiently.'
 
 			act 'Leave him alone': gt 'post_office', 'start'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'start':
 			postjobQW = 4
 			'"I''ve given it some thought and I''d like to take the job," you tell him.'
 			'"That''s great! In that case, I''ll let Aleksiy know he no longer has to come in on weekends. See you on Saturday!" he says while shaking your hand.'
-			'You can now deliver mail every Saturday from 12:00 to 15:00.'
+			'You can now deliver mail every Saturday from '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 15, 0, cheatVars['time_format'])+'.'
 			act 'Leave the postmaster''s office': gt 'post_office', 'start'
 		end
 	elseif postjobQW = 4:
@@ -255,7 +255,7 @@ if $ARGS[0] = 'start':
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
-			'"You''re a bit early, <<$pcs_firstname>>!" the postmaster says when he sees you enter his office. "I don''t have your mail yet, but I like the enthusiasm. Come see me between 11:00 and 12:00. I should have it ready then."'
+			'"You''re a bit early, <<$pcs_firstname>>!" the postmaster says when he sees you enter his office. "I don''t have your mail yet, but I like the enthusiasm. Come see me between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'. I should have it ready then."'
 
 			act 'Leave him alone': gt 'post_office', 'start'
 		elseif hour > 11 and postworkday ! daystart:

+ 1 - 1
locations/post_office.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'counter':
 			minut += 5
 			gs 'stat'
 			'You approach the counter and greet the girl there. "Excuse me, I hear you''re looking for postal workers?"'
-			'She nods understandingly. "We''re looking for new workers and I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Oleg Koltsov, the postmaster. He''s usually in his office between 12:00 and 14:00. I bet he''ll hire you! Good luck when you see him!"'
+			'She nods understandingly. "We''re looking for new workers and I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Oleg Koltsov, the postmaster. He''s usually in his office between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'. I bet he''ll hire you! Good luck when you see him!"'
 			act 'Step away from the counter': gt 'post_office', 'start'
 		end
 	end

+ 1 - 1
locations/praiders_garage_chat.qsrc

@@ -340,7 +340,7 @@ if $ARGS[0] = 'chat_anushka':
 	elseif gopnikbandQW['nushob'] = 3:
 		'She goes quiet all of a sudden, like she''s crashing from a high. She''s wearing sunglasses and looks like she''s had a rough go of it lately, like she might still be hungover or something. You give her a slight nudge and she groans and shifts slowly in her seat before stirring to life. "Huh? What?"'
 		'"You okay, Anushka?" you ask as you watch her squirm and stretch. She lifts her sunglasses to rub her eyes and you notice that it looks like she hasn''t slept in a while.'
-		'"Oh dude... Lav had us out partying until like, 5AM. I don''t know what the fuck he gave us, but I think I''m still hearing colors." The two of you talk, mostly about the drug hazed party they had last night, which she seems to not fully remember.'
+		'"Oh dude... Lav had us out partying until like, '+func('time', 'get_time_string', 5, 0, cheatVars['time_format'])+'. I don''t know what the fuck he gave us, but I think I''m still hearing colors." The two of you talk, mostly about the drug hazed party they had last night, which she seems to not fully remember.'
 		'Your conversation with Anushka starts winding down and you seem to be running out of small talk. Now seems like a good time to ask her about something specific.'
 		act 'Ask her some questions': gt 'praiders_garage_chat', 'chat_anushka1'
 	elseif gopnikbandQW['nushob'] = 4:

+ 1 - 1
locations/pushkin_ballet_class.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'first_lesson':
 				$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_teach_1.jpg'
 				gs 'core_library', 'stage_title'
 				'You rehearse several times before she''s happy, and then she hands critique notes to all the girls. When she gives you yours, she compliments you before gathering Maya and Kima aside for a private talk.'
-				'"Tomorrow your assessment will start at 09:00. You will enter the room in First Position and wait for the examiners'' instructions. Once you have performed the Entrance of the Swans, you will be asked to perform a Pas de Deux with your dance partner."'
+				'"Tomorrow your assessment will start at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'. You will enter the room in First Position and wait for the examiners'' instructions. Once you have performed the Entrance of the Swans, you will be asked to perform a Pas de Deux with your dance partner."'
 				'"Your final examination is a solo divertissement lasting no more than five minutes. This performance shows your ability to the judges and will be freeform."'
 				'"Any questions? If you have any tonight or need assistance, contact <<$npc_firstname[''A284'']>>, and she will advise or help as needed."'
 				act 'Reverence':

+ 2 - 2
locations/pushkin_ballet_evt.qsrc

@@ -183,7 +183,7 @@ if $ARGS[0] = 'res_events':
 					'"The school thinks of everything, doesn''t it?"'
 					'"It tries. It helped me adapt to the life here when my mother got the job. The first year was brutally tough at the local school with the kids bullying me for being a villager. The ballet school became my refuge."'
 					'"This is why you''re organizing the party?"'
-					'"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at 18:30. Don''t miss it!", she shouts."'
+					'"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+'. Don''t miss it!", she shouts."'
 					act 'Follow her into the kitchen': gt 'pushkin_ballet_evt', 'res_events', 'kitchen_birthday'
 					act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
 				end
@@ -195,7 +195,7 @@ if $ARGS[0] = 'res_events':
 				'<center><img height="600" src="<<$npc_img_path[''A279'']>>/279.jpg"></center>'
 				'You hand the card back to <<$npc_firstname[''A279'']>> after signing it, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
 				'"Think nothing of it, <<$npc_firstname[''A279'']>>. If it makes her feel better, that''s great," you say.'
-				'"Yeah, look, I need to start cooking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
+				'"Yeah, look, I need to start cooking the food for tonight. Will you come to the communal room after '+func('time', 'get_time_string', 18, 30, cheatVars['time_format'])+'?" You nod your head in a non-committal way as she leaves.'
 				act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
 			end
 		elseif $ARGS[2] = 'party':

+ 2 - 2
locations/pushkin_ballet_init.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'init':
 			$balletEv['trigger'] = 'late'
 			gs 'npc_274_init', 'summer_school'
 		elseif $loc = 'pushkin_ballet_res' and $loc_arg = 'hallway' and (hour >= 6 and hour < 8) and (day >= 1 or day <= 6):
-				act 'Go to School (07:30 start)': gt 'pushkin_ballet_class', 'start'
+				act 'Go to School ('+func('time', 'get_time_string', 7, 30, cheatVars['time_format'])+' start)': gt 'pushkin_ballet_class', 'start'
 		end
 
 		if daystart > 188 and $loc = 'bedrPar' and mod_ballet['letter'] = 1:
@@ -80,7 +80,7 @@ end
 
 if $ARGS[0] = 'reputation':
 	!! Check reputation to have a conversation with the warden
-	if fame['pav_modelling'] >= 10 or fame['pav_slut'] > 9  or fame['city_prostitute'] > 0 or fame['ciy_sexind'] > 0 or fame['city_modelling'] >= 10 or fame['city_slut'] > 30  or fame['city_prostitute'] > 19 or fame['city_sexind'] > 19 or fame['pushkin_modelling'] >= 10 or fame['pushkin_slut'] > 0  fame['pushkin_sex'] > 0 or fame['pushkin_prostitute'] > 0 or fame['pushkin_sexind'] > 0:
+	if fame['pav_modelling'] >= 10 or fame['pav_slut'] > 9  or fame['city_prostitute'] > 0 or fame['ciy_sexind'] > 0 or fame['city_modelling'] >= 10 or fame['city_slut'] > 30  or fame['city_prostitute'] > 19 or fame['city_sexind'] > 19 or fame['pushkin_modelling'] >= 10 or fame['pushkin_slut'] > 0 or fame['pushkin_sex'] > 0 or fame['pushkin_prostitute'] > 0 or fame['pushkin_sexind'] > 0:
 
 		!! gt 'pushkin_ballet_res', 'warden', 'reputation'
 	end

+ 2 - 2
locations/pushkin_ballet_res.qsrc

@@ -287,9 +287,9 @@ if $ARGS[0] = 'rules':
 	*pl 'Whilst you stay in this accommodation, you will follow these rules:'
 	*nl
 	'1) No males are allowed in the accommodation block.'
-	'2) All residents must return to the block by 21:00. No exceptions. If you are late, you will have to report to the duty warden.'
+	'2) All residents must return to the block by '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'. No exceptions. If you are late, you will have to report to the duty warden.'
 	'3) No smoking, drinking, or drug use is allowed in the accommodation. If you are caught, you will face immediate dismissal from the school.'
-	'4) Breakfast is from 06:00 to 07:00.'
+	'4) Breakfast is from '+func('time', 'get_time_string', 6, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 7, 0, cheatVars['time_format'])+'.'
 	'5) All rooms must be kept clean and tidy.'
 	'6) Valuables can be left with the duty warden if required. All thefts or problems are to be reported immediately.'
 	'7) You are to follow the duty warden''s instructions in an emergency.'

+ 1 - 1
locations/pushkin_ballet_secrets.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'reception':
 		end
 	elseif hour >= 16:
 		*nl
-		'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
+		'All the evening classes have started today, you need to be here before '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to ensure you can attend.'
 	end
 end
 

+ 6 - 6
locations/pushkin_sq.qsrc

@@ -17,13 +17,13 @@ gs 'music_actions', 'clear_restrictions'
 if hour >= 8 and hour <= 20:
 	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
 else
-	'There is a small whole foods store that is open from 8:00 - 20:00 everyday. It is currently closed.'
+	'There is a small whole foods store that is open from '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' everyday. It is currently closed.'
 end
 
 if hour >= 10 and hour <= 22:
 	'A quaint little restaurant has put a sign outside of its door, reading, "<a href="exec:gt ''pushkin_cafe'',''start''">Liamel Cafe</a>."'
 else
-	'Liamel Cafe is current closed, it is open every day 10:00 - 22:00'
+	'Liamel Cafe is current closed, it is open every day '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 22, 0, cheatVars['time_format'])+''
 end
 
 if week < 7 and hour >= 9 and hour <= 17:
@@ -31,20 +31,20 @@ if week < 7 and hour >= 9 and hour <= 17:
 	'Clothing for younger women is catered for in <a href="exec:gt ''shop_flamingos'',''start''">Flamingos</a>.'
 	'Catering for the burlesque club here there is the <a href="exec:gt ''shop_fancy_pancy'',''start''">Fancy Pancy</a> boutique clothing store.'
 	else
-	'Tsar Bomba, Flamingos and Fansy Pansy,  are all current closed, they are open open Mon - Sat day 9:00 - 18:00'
+	'Tsar Bomba, Flamingos and Fansy Pansy,  are all current closed, they are open open Mon - Sat day '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+''
 end
 if week < 7 and hour >= 9 and hour <= 17:
 	'<a href="exec:gt ''pushkin_ballet_secrets'',''init''">Ballet Secrets</a> is located at the end of a well maintained alleyway with a flamboyant ballet shop display and despite it''s name the premises offers a wide range of services for dancers and athletes. '
 elseif 	week = 7 and (hour >= 10 and hour <=16):
 	'The dance shop is closed, but you can still access the <a href="exec:gt ''pushkin_ballet_secrets'',''init''">Members Area</a> with your card.'
 else
-	'Ballet Secrets is currently closed. The shop opens 09:00-17:00 Monday to Saturday, and members only access for class is open on Sunday from 10:00 - 17:00.'
+	'Ballet Secrets is currently closed. The shop opens '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' Monday to Saturday, and members only access for class is open on Sunday from '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.'
 end
 if exhibitionQW > 3:
 	if week < 7 and hour >= 8 and hour <= 17:
 		'<a href="exec:gt ''shop_exhibitionist'',''start''">Simply Salacious</a> is just down a small side street from here.'
 	else
-		'<b>Simply Salacious,</b> is open Mon - Sat, 8:00 - 18:00'
+		'<b>Simply Salacious,</b> is open Mon - Sat, '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+''
 	end
 end
 
@@ -56,7 +56,7 @@ if hour >= 12 or hour < 2:
 		'There is a burlesque club in an old theatre here. Such perversion is unhealthy and you cannot bring yourself to go there.'
 	end
 else
-	'The old theatre that houses a burlesque club is closed now. It is open every day 18:00 - 23:00'
+	'The old theatre that houses a burlesque club is closed now. It is open every day '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' - '+func('time', 'get_time_string', 23, 0, cheatVars['time_format'])+''
 end
 
 if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:

+ 1 - 1
locations/radomir_popov_schedule.qsrc

@@ -132,7 +132,7 @@ end
 if $ARGS[0] = 'getLocation':
 	!Set the text for the current NPC ID
 	if locat['A154'] = 0:
-		$npcLocation['A154'] = 'Radomir not home Fri and Sat 20:00 for rest of night.'
+		$npcLocation['A154'] = 'Radomir not home Fri and Sat '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' for rest of night.'
 	elseif locat['A154'] = 1:
 		$npcLocation['A154'] = 'Radomir in the hallway.'
 	elseif locat['A154'] = 2:

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff