The great Liam name change to Pushkin. File name change to make the location easier to find under Pushkin which is how it's referred in-game, all image names remain the same as do their paths. Liamel Café remains the same in display name, but filename has changed. Location transition testing completed, but quests require further testing to ensure no bugs.

glife.qproj

@@ -1281,15 +1281,15 @@
 		<Location name="belpicknick"/>
 	</Folder>
 	<Folder name="Old Town">
-		<Location name="liam"/>
-		<Location name="liamelkafe"/>
+		<Location name="pushkin"/>
+		<Location name="pushkin_cafe"/>
 		<Location name="stallion"/>
 		<Location name="larek"/>
 		<Location name="dvor"/>
 		<Location name="ugol"/>
 		<Location name="ugol1"/>
 		<Location name="artstudia"/>
-		<Location name="liames"/>
+		<Location name="pushkin_sq"/>
 		<Location name="burlesque"/>
 		<Location name="rasputin_entrance"/>
 		<Location name="rasputin_host"/>

locations/Cheatmenu_din.qsrc

@@ -2751,7 +2751,7 @@ $cheatmenu = {
 	*nl
 	*nl
 	'<a href="exec:gt''pav_residential''">Teleport to Pavlovsk</a>'
-	'<a href="exec:gt''liam''">Teleport to Pushkin</a>'
+	'<a href="exec:gt''pushkin''">Teleport to Pushkin</a>'
 	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'

locations/burlesque.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 !!	act 'Get a "private dance"': gt 'burlesque', 'dance'
 !!	act 'Enquire about a job': gt 'burlesque', 'interview'
 
-	act 'Leave': gt 'liames'
+	act 'Leave': gt 'pushkin_sq'
 end
 
 

locations/carF.qsrc

@@ -14,7 +14,7 @@ $enddrive = {
 	if cardrive = 11:gt 'city_sauna'
 	if cardrive = 12:gt 'obekt'
 	if cardrive = 13:gt 'dachi'	
-	if cardrive = 14:gt 'liam'
+	if cardrive = 14:gt 'pushkin'
 	if cardrive = 18:gt 'city_mansion_entrance'
 	if cardrive = 19:gt 'city_industrial_train', 'outside'
 	if cardrive = 20:gt 'pav_residential'

locations/dibodi.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'sgtusa':
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/photo.jpg"></center>'
     'You walk over to a group of girls and boys talking and introduce yourself.'
     'You are surprisingly well received.'
-	act 'Continue': gt'liames'
+	act 'Continue': gt'pushkin_sq'
 end
 
 if $ARGS[0] = 'sotusa':
@@ -72,7 +72,7 @@ if $ARGS[0] = 'sotusa':
 	if sttan = 0 and $pantyworntype = 'none':
 	    sttan = 1
 	    '"Hey <<$pcs_nickname>>, what''s with the no panties?" The crowd laughs out loud, noticing your lack of underwear.'
-	    act 'Continue':gt'liames'
+	    act 'Continue':gt'pushkin_sq'
 	end
 end
 
@@ -86,7 +86,7 @@ if $ARGS[0] = 'sptusa':
 	act 'You live around here?':
 		cla
 		'"Yes," Marinka says.'
-		act 'Say goodbye and leave': gt 'liam'
+		act 'Say goodbye and leave': gt 'pushkin'
     end    
 end
 

locations/dina.qsrc

@@ -15,7 +15,7 @@ $brodilr = {
 	if mid($start_type,1,2) = 'sg' and accessible_property['parents_home'] = 4:
 		gt 'pav_residential'
 	elseif accessible_property['old_town_apartment'] = 1:
-		gt'liames'
+		gt'pushkin_sq'
 	else
 		gt'city_residential','start'
 	end

locations/dvor.qsrc

@@ -7,7 +7,7 @@ gs 'stat'
 '<center><B>Vacant House</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/dvor1.jpg" ></center>'
 
-act 'Go to town center':minut += 5 & gt 'liam'
+act 'Go to town center':minut += 5 & gt 'pushkin'
 
 if hour >= 7 and hour <= 21 and pavserhom = 0 and koncepo = 0 or mesec = 1:
     act 'Read the notice on the door':dynamic $koncepodos

locations/exhibitionistshop.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave':
 		minut += 5
-		gt 'liames'
+		gt 'pushkin_sq'
 	end
 
 	if hour >= 18:

locations/food_menu.qsrc

@@ -292,7 +292,7 @@ elseif $loc = 'lakecafe':
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
 	$_drink['5,price'] = 200
-elseif $loc = 'liamelkafe':
+elseif $loc = 'pushkin_cafe':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'

locations/homes_properties_attr.qsrc

@@ -226,7 +226,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['name'] = 'Old town apartment'
 		$property['display'] = 'apartment in the old town of Pushkin'
 		$property['town'] = 'oldtown'
-		$property['location'] = 'liames'
+		$property['location'] = 'pushkin_sq'
 		$property['location_arg'] = ''
 		$property['entrance'] = 'korr2x'
 		$property['entrance_arg'] = ''

locations/korr2x.qsrc

@@ -69,7 +69,7 @@ act '<b><font color="maroon">Go outside</font></b>':
 		'<b><font color="red">You''re too sick to walk around in the streets.</font></b>'
 		xgt $curloc
 	else
-		xgt'liames'
+		xgt'pushkin_sq'
 	end
 end
 !!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check

locations/music_buskingevents.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'calculate_tips':
 		ml_location_mod = 30
 	elseif $region = 'pav':
 		ml_location_mod = 0
-	elseif $region = 'liames':
+	elseif $region = 'pushkin_sq':
 		ml_location_mod = 15
 	end 	
 

locations/olutaxi.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'station':
 					'You smile to Olu. "I will and thanks for the ride."'
 					'Olu returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
-					act 'Go to the Old Town': gt 'liam'
+					act 'Go to the Old Town': gt 'pushkin'
 				end
 			end
 		end
@@ -132,7 +132,7 @@ if $ARGS[0] = 'station':
 					'You smile to him. "I will and thanks for the ride."'
 					'He returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
-					act 'Go to the Old Town': gt 'liam'
+					act 'Go to the Old Town': gt 'pushkin'
 				end
 			end
 		end

locations/parks.qsrc

@@ -19,9 +19,9 @@ if $ARGS[0] = 'start':
 	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a>.'
 
 
-	act 'Go to Okhlopkov Square (0:05)': minut += 5 &  gt 'liames'
+	act 'Go to Okhlopkov Square (0:05)': minut += 5 &  gt 'pushkin_sq'
 
-	act 'Go to Town Center (0:10)': minut += 10 & gt 'liam'
+	act 'Go to Town Center (0:10)': minut += 10 & gt 'pushkin'
 
 	act 'Walk around the park (1 hour)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1

locations/pav_commercial.qsrc

@@ -149,7 +149,7 @@ act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
 act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'pushkin'
 
 gs 'music_actions', 'music_icon'
 

locations/pav_complex.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
+	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):

locations/pav_industrial.qsrc

@@ -80,7 +80,7 @@ act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'pav_factory', 'tailor'

locations/pav_market.qsrc

@@ -305,7 +305,7 @@ act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'pushkin'
 
 gs 'camera', 'check_location'
 

locations/pav_park.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'start':
 
 	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'liam'
+	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'pushkin'
 	act 'Go further into the park':minut += 2 & gt 'pav_park', 'deeper_park'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theatre</a> in the park.'
@@ -684,7 +684,7 @@ if $ARGS[0] = 'deeper_park':
 	end
 	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'liam'
+	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'pushkin'
 	act 'Go back to the entrance':minut += 2 & gt 'pav_park', 'start'
 	gs 'treeCircEntry', 'PavlovskPark'
 	act 'Go for a walk (0:15)':

locations/pav_residential.qsrc

@@ -158,7 +158,7 @@ act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/pav_train_hall.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = '':
 	act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 	act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 	act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-	act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
+	act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'pushkin'
 
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'

locations/prostitution_functions.qsrc

@@ -226,7 +226,7 @@ end
 if $ARGS[0] = 'check_solicitation_event':
 	gs 'prostitution_functions', 'work_clothes'
     if prostitute['blocked'] = 0:
-        if (($loc_arg = '' and ($loc = 'pav_commcenter' or $loc = 'pav_residential' or $loc = 'pav_industrial' or $loc = 'pav_commercial' or $loc = 'pav_market' or $loc = 'liam')) or ($loc_arg = 'start' and ($loc = 'pav_complex' or $loc = 'pav_park'))) and hour > 6 and hour < 23 and $curloc ! 'shop' and menu_off = 0 and $loc = $curloc:
+        if (($loc_arg = '' and ($loc = 'pav_commcenter' or $loc = 'pav_residential' or $loc = 'pav_industrial' or $loc = 'pav_commercial' or $loc = 'pav_market' or $loc = 'pushkin')) or ($loc_arg = 'start' and ($loc = 'pav_complex' or $loc = 'pav_park'))) and hour > 6 and hour < 23 and $curloc ! 'shop' and menu_off = 0 and $loc = $curloc:
 
             if prostitute['pavlovsk'] = 1 and prostitute['pav_time_hour'] ! hour and rand(-20, 70) < minut and $curloc ! 'prostitution_pavlovsk' and $curloc ! 'shop' and menu_off = 0 and $loc = $curloc: 
                 gs 'prostitution_pavlovsk', 'chance'

locations/prostitution_pavlovsk.qsrc

@@ -1333,7 +1333,7 @@ end
 
 if $ARGS[0] = 'travel':
 	if $prostitute['pav_walk'] = 'pav_residential' or $prostitute['pav_walk'] = 'pav_complex':
-		if $loc = $loc = 'liam':
+		if $loc = $loc = 'pushkin':
 			minut += 20
 		elseif $loc = 'pav_industrial' or $loc = 'pav_market':
 			minut += 15
@@ -1344,7 +1344,7 @@ if $ARGS[0] = 'travel':
 		end
 		$loc_arg = iif($prostitute['pav_walk'] = 'pav_complex', 'start', '')
 	elseif $prostitute['pav_walk'] = 'pav_commercial':
-		if $loc = $loc = 'liam':
+		if $loc = $loc = 'pushkin':
 			minut += 15
 		elseif $loc = 'pav_commercial':
 			minut += 5
@@ -1353,7 +1353,7 @@ if $ARGS[0] = 'travel':
 		end
 		$loc_arg = ''
 	elseif $prostitute['pav_walk'] = 'pav_market':
-		if $loc = 'liam' or $loc = 'pav_commercial':
+		if $loc = 'pushkin' or $loc = 'pav_commercial':
 			minut += 10
 		elseif $loc = 'pav_market':
 			minut += 5

locations/liam.qsrc → locations/pushkin.qsrc

@@ -1,15 +1,11 @@
-# liam
+# pushkin
 !!2021/05/14
-
-$loc_arg = ''
-$loc = 'liam'
-$location_type = 'public_outdoors'
-$menu_loc = 'liam'
+*clr & cla
+gs 'shortgs', 'setloc', 'pushkin', $ARGS[0]
 $region = 'puskin'
 $menu_arg = ''
 menu_off = 0
 if sound = 0:PLAY 'sound/street.mp3',30
-*clr & cla
 gs'stat'
 '<center><B>Pushkin Town Center</B></center>'
 if month >= 11 or month <= 3:
@@ -30,7 +26,7 @@ end
 'Later, the rich bought the land off the poor and knocked down the wooden shacks and farm houses to build large estates. The town began to grow rapidly, and it became a desirable suburb.'
 'Since then, even the old houses have been improved, extended, and modernized. The old buildings and beautiful park made it popular with tourists, and expansion has lead to the boarders between itself and Pavlovsk being merged.'
 
-'Not far from here is the <a href="exec:minut += 5 & gt ''liames''">Okhlopkov Square</a> with its boutique shops.'
+'Not far from here is the <a href="exec:minut += 5 & gt ''pushkin_sq''">Okhlopkov Square</a> with its boutique shops.'
 'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
 'You can also see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses leading to a courtyard.'
 if car > 0 and cardrive = 14:
@@ -54,7 +50,7 @@ end
 !!this location does not exist
 !!if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
-act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
+act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'pushkin_sq'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 19 & gt 'road'
 act 'Walk to the park (0:10)':minut += 10 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
@@ -73,7 +69,7 @@ if pushkin_walk_day ! daystart:
 		pushkin_walk_day = daystart
 		gs 'stat'
 		'You breathe in the fresh air and slowly walk along the narrow streets of the Old Town, admiring the beautiful architecture.'
-		act 'Continue': gt'liam'
+		act 'Continue': gt'pushkin'
 	end
 end
 
@@ -83,5 +79,5 @@ act 'Wait':gs 'obj_din', 'wait'
 if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
 
 
---- liam ---------------------------------
+--- pushkin ---------------------------------
 

locations/liamelkafe.qsrc → locations/pushkin_cafe.qsrc

@@ -1,8 +1,7 @@
-# liamelkafe
+# pushkin_cafe
 !!2021/04/15
 if $ARGS[0] = 'start':
-	$menu_loc = 'liamelkafe'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'pushkin_cafe', $ARGS[0]
 	menu_off = 0
 	$location_type = 'indoors'
 	gs 'stat'
@@ -12,7 +11,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'What little floor space the quaint cafe has, is packed with many small tables and chairs.'
 
-	act 'Leave the cafe':gt 'liames'
+	act 'Leave the cafe':gt 'pushkin_sq'
 
 	if hour > 11 and hour < 13:
 		'The cafe is packed with people eating their afternoon meal.'
@@ -22,21 +21,21 @@ if $ARGS[0] = 'start':
 		if stallionQ = 1: stallionQ = 2
 	end
 	if money > 45:
-		act 'Sit down for a meal': money -= 45 & gt 'liamelkafe', 'food'
+		act 'Sit down for a meal': money -= 45 & gt 'pushkin_cafe', 'food'
 	end
 end
 
 if $ARGS[0] = 'food':
 	$loc_arg = 'food'
-	$loc = 'liamelkafe'
-	$menu_loc = 'liamelkafe'
+	$loc = 'pushkin_cafe'
+	$menu_loc = 'pushkin_cafe'
 	$menu_arg = 'food'
 	menu_off = 0
 	'<center><B><font color=maroon>Liamel Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/cafe/larek.jpg" ></center>'
 
-	act 'Leave the table':gt 'liamelkafe', 'start'
+	act 'Leave the table':gt 'pushkin_cafe', 'start'
 	act 'Order from the menu (0:05)':gs 'food_menu'
 	if stallionQ = 2:
 		if FocH > (Foch_Max - 10):
@@ -52,5 +51,5 @@ if $ARGS[0] = 'food':
 
 end
 
---- liamelkafe ---------------------------------
+--- pushkin_cafe ---------------------------------
 

locations/liames.qsrc → locations/pushkin_sq.qsrc

@@ -1,14 +1,10 @@
-# liames
+# pushkin_sq
 !!2021/05/14
-
-$loc_arg = ''
-$loc = 'liames'
+*clr & cla
+gs 'shortgs', 'setloc', 'pushkin_sq', $ARGS[0]
 $region = 'pushkin'
 $location_type = 'public_outdoors'
-$menu_loc = 'liames'
-$menu_arg = ''
 menu_off = 0
-*clr & cla
 gs'stat'
 
 '<center><B>Okhlopkov Square</B></center>'
@@ -16,7 +12,7 @@ gs'stat'
 'Okhlopkov Square serves as the main intersection of several smaller streets.'  
 'There are many small cafes and shops also a flourishing nightlife and entertainment activities.'
 
-'Another street runs straight back to the <a href="exec:minut += 5 & gt ''liam''">Pushkin Town Center</a>.'
+'Another street runs straight back to the <a href="exec:minut += 5 & gt ''pushkin''">Pushkin Town Center</a>.'
 'Okhlopkov Square itself leads to the <a href="exec:minut += 5 & gt ''parks'',''start''">Pushkin Park</a>.'
 if hour >= 8 and hour <= 20:
 	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
@@ -25,7 +21,7 @@ else
 end
 
 if hour >= 10 and hour <= 22:
-	'A quaint little restaurant has put a sign outside of its door, reading, "<a href="exec:gt ''liamelkafe'',''start''">Liamel Cafe</a>."'
+	'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'
 end
@@ -59,7 +55,7 @@ end
 
 if func('homes_properties', 'is_property_of_status', 'rented', 'old_town_apartment'): act '<b>Go home</b>':gt'korr2x'
 
-act 'Walk to the Town Center (0:05)':minut += 5 & gt 'liam'
+act 'Walk to the Town Center (0:05)':minut += 5 & gt 'pushkin'
 
 if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
@@ -89,13 +85,13 @@ if rand(0,100) >= 60 and pcs_lover < 3 and rand(0,1200) <= pcs_apprnc:
 	'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
 	'The guy introduced himself as <<$boydesc>> and asks you for your telephone number.'
 
-	act 'Walk away': gt 'liames'
+	act 'Walk away': gt 'pushkin_sq'
 	act 'Tell him your telephone number.':
 		cla
 		gs'boyfrend', 'start'
 		stopboy = 0
 		'<<$boydesc>> saved your phone number and left.'
-		act 'Continue': gt 'liames'
+		act 'Continue': gt 'pushkin_sq'
 	end
 end
 
@@ -107,7 +103,7 @@ if rand(1,100) >= 95:
 
 	'Making your way down Okhlopkov Square, you see a woman waiting patiently while an artist paints her portrait.'
 
-	act 'Continue': gt'liames'
+	act 'Continue': gt'pushkin_sq'
 end
 
 gs 'music_actions', 'music_icon'
@@ -134,7 +130,7 @@ elseif hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/photo.jpg"></center>'
 		'The girls and boys at the local hangout happily greet you.'
 
-		act'Leave': gt 'liames'
+		act'Leave': gt 'pushkin_sq'
 		
 		if $pantyworntype = 'none' and sttan = 0:
 			cla
@@ -163,7 +159,7 @@ if stallionQ = 3:
 		act 'Hold it (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			stallionQ = 1
-			gt 'liames'
+			gt 'pushkin_sq'
 		end
 	else
 		act 'Hold it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -171,5 +167,5 @@ if stallionQ = 3:
 	act 'Use the Men''s Restroom': gt 'stallion','start'
 end
 
---- liames ---------------------------------
+--- pushkin_sq ---------------------------------
 

locations/rasputin_entrance.qsrc

@@ -21,12 +21,12 @@ if hour >= 2 and hour < 15:
 				if rasputin['burlesque_ticket'] = 2: rasputin['burlesque_ticket'] = 0
 				if rasputin['variety_ticket'] = 2: rasputin['variety_ticket'] = 0
 				minut += 1
-				gt 'liames'
+				gt 'pushkin_sq'
 			end
 			act 'No': gt 'rasputin_entrance'
 		else
 			minut += 1
-			gt 'liames'
+			gt 'pushkin_sq'
 		end
 	end
 
@@ -46,7 +46,7 @@ else
 
 	act	'Return to the square':
 		minut += 1
-		gt 'liames'
+		gt 'pushkin_sq'
 	end
 
 	act	'Visit the hostess':

locations/rasputin_walkway.qsrc

@@ -15,7 +15,7 @@ gs 'stat'
 
 if hour > 2 and hour < 15:
 	msg 'The club is closing up for the day and the staff lead you outside.'
-	gt 'liames'
+	gt 'pushkin_sq'
 else
 	act	'Leave':
 		minut += 1

locations/road.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 	end
 	if nroad = 16: act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 19:
-		act 'Walk to Pushkin (0:05)': minut += 5 & gt 'liam'
+		act 'Walk to Pushkin (0:05)': minut += 5 & gt 'pushkin'
 	end
 	if nroad = 20:
 		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train_hall'
@@ -176,7 +176,7 @@ if $ARGS[0] = '':
 	elseif nroad = 18:
 		''
 	elseif nroad = 19:
-		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''liam''">old town</a> district of Pavlovsk. About five minutes down a cobblestone road is the old town center. It''s a fairly popular place for tourists to explore with much of its old architecture still intact.'
+		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''pushkin''">old town</a> district of Pavlovsk. About five minutes down a cobblestone road is the old town center. It''s a fairly popular place for tourists to explore with much of its old architecture still intact.'
 	elseif nroad = 20:
 		'The main road ends at the provincial town of Pavlovsk. You can see the castle in the distance.'
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break and is having a cigarette. He could probably bring you to Gadukino or St. Petersburg, for a price...'

locations/road_prostitution.qsrc

@@ -120,7 +120,7 @@ if $ARGS[0] = 'road_segment':
 	elseif nroad = 18:
 		''
 	elseif nroad = 19:
-!!		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''liam''">old town</a> district of Pavlovsk. About five minutes down a cobblestone road is the old town center. It''s a fairly popular place for tourists to explore with much of its old architecture still intact.'
+!!		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''pushkin''">old town</a> district of Pavlovsk. About five minutes down a cobblestone road is the old town center. It''s a fairly popular place for tourists to explore with much of its old architecture still intact.'
 	elseif nroad = 20:
 	!! NOTE: This is right next to the Boris diner, so it should be tied with that - maybe starting to work here will move to the parking lot? Same work location as if it was started from the diner
 !!		'The main road ends at the provincial town of Pavlovsk. You can see the castle in the distance.'

locations/shop_fancy_pancy.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 
 	'The boutique sells designer winter coats, burlesque clothing, beautiful shoes and exquisite handbags.'
 
-	act 'Leave the boutique': minut += 3 & gt 'liames'
+	act 'Leave the boutique': minut += 3 & gt 'pushkin_sq'
 	
 	act 'View clothing': minut += 5 & gt 'shop_fancy_pancy', 'clothes'
 end

locations/shop_flamingos.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'Flamingos is trendy and modern while still keeping the prices low enough for the large student population on the Island. It mimics the latest fashions for young adults but cuts costs on material and manufacturing. This suits the clients who are likely to grow bored of an outfit before it falls apart and that''s why it''s always busy.'
 
-	act 'Leave the flamingos': minut += 3 & gt 'liames'
+	act 'Leave the flamingos': minut += 3 & gt 'pushkin_sq'
 	
 	act 'View dresses': minut += 5 & gt 'shop_flamingos', 'dresses'
 

locations/shop_tsar_bomba.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	'Tsar Bomba, a small clothing shop in the Okhlopkov Square. The shop is unique and used to be very cool with punk fashion. These days it is much more generic and alternative, it could easily be mistaken for an alt. fashion chain store.'
 	'Simply put this place is very cool and most of the clothes are strange and wonderful.'
 
-	act 'Leave the bomba': minut += 3 & gt 'liames'
+	act 'Leave the bomba': minut += 3 & gt 'pushkin_sq'
 	
 	act 'View dresses': minut += 5 & gt 'shop_tsar_bomba', 'dresses'
 

locations/stallion.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'awaken':
 	if stallionQ = 4: $temp[1] = 'I am called Stallion, and you have become my victim. I am called Stallion because I impregnate those whom I target. Today, that was you. ' & stallionQ = 5
 	'There is a note next to your clothing. ''<<$temp[1]>>You were a pretty good fuck. I''ll be keeping my eye on you. I look forward to see you growing large with my baby. If you go get an abortion to stop it, <<$temp>>. Go to the cops if you want, you''ll never stop me. The door is unlocked, you can leave now. -Stallion'
 	
-	act 'Leave':gt 'liames'
+	act 'Leave':gt 'pushkin_sq'
 end
 
 --- stallion ---------------------------------

locations/succubus.qsrc

@@ -1020,8 +1020,8 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 4: $sucgoloc = 'pav_market' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'motel' & $sucgometka = ''
 		elseif sucslpzone = 4:
-			if sctemp = 1: $sucgoloc = 'liam' & $sucgometka = ''
-			if sctemp = 2: $sucgoloc = 'liames' & $sucgometka = ''
+			if sctemp = 1: $sucgoloc = 'pushkin' & $sucgometka = ''
+			if sctemp = 2: $sucgoloc = 'pushkin_sq' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'parks' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'pav_market' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'city_industrial' & $sucgometka = ''

locations/ugol.qsrc

@@ -12,7 +12,7 @@ else
 	'Entering the passage, you discover a strange collection of shades of brown, the walls covered in streaks, cracks, and plaster and the floor dirty. It seems this area is not as well maintained as the outside.'
 end
 
-act 'Leave':gt 'liam'
+act 'Leave':gt 'pushkin'
 
 '<a href="exec:gt ''artstudia'',''bodimod1''">Quiet courtyard</a>.'