Merge remote-tracking branch 'Gwen/master'

locations/liam.qsrc

@@ -1,5 +1,6 @@
 # liam
-!!2021/05/12
+!!2021/05/14
+
 $loc_arg = ''
 $loc = 'liam'
 $location_type = 'public_outdoors'
@@ -60,7 +61,7 @@ end
 
 if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
-act 'Walk to High Street (0:05)':minut += 5 & gt 'liames'
+act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
 act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pav_train'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'

locations/liames.qsrc

@@ -1,5 +1,5 @@
 # liames
-!!2021/05/12
+!!2021/05/14
 
 $loc_arg = ''
 $loc = 'liames'
@@ -24,8 +24,9 @@ set borLoker=0
 '<center><img <<$set_imgh>> src="images/locations/pushkin/liames.jpg" ></center>'
 '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 to the <a href="exec:minut += 5 & gt ''liam''">Town Center</a>.'
-'Okhlopkov Square itself leads to the Pushkin <a href="exec:minut += 5 & gt ''parks'',''start''">Park</a>.'
+
+'Another street runs straight back to the <a href="exec:minut += 5 & gt ''liam''">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.'
 else
@@ -48,20 +49,20 @@ end
 
 if exhibitionQW > 3:
 	if week < 7 and hour >= 8 and hour <= 17:
-		'<a href="exec:gt ''exhibitionistshop'',''start''">Expression of You</a> is just down a small side street from here.'
+		'<a href="exec:gt ''exhibitionistshop'',''start''">Simply Salacious</a> is just down a small side street from here.'
 	else
-		'<b>Expression of You,</b> is open Mon - Sat, 8:00 - 18:00'
+		'<b>Simply Salacious,</b> is open Mon - Sat, 8:00 - 18:00'
 	end
 end
 
 if hour >= 18 and hour <= 22:
 	if pcs_inhib > 30:
-		'There is a <a href="exec:gt ''burlesque'',''start''">burlesque club</a> with shows running until 23:00, that was once an old theatre.'
+		'There is a burlesque club named<a href="exec:gt ''burlesque'',''start''">Rasputin</a> with shows running until 23:00, that was once an old theatre.'
 	else
 		'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 housing 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 18:00 - 23:00'
 end
 
 if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'