Merge remote-tracking branch 'upstream/master'

locations/AleksandraHome.qsrc

@@ -56,9 +56,9 @@ if $args[0] = 'library':
 			'You finish checking out the novel and start heading towards the exit. <<$npc_firstname[''A231'']>> mentions that she has to use the bathroom before heading home and you to go as well.'
 			act 'Go to the bathroom':
 				minut += 5
-				$metka = 'womens'
+				$loc_arg = 'womens'
 				$loc = 'gdktoilet'
-				$metkaM = 'womens'
+				$locM_arg = 'womens'
 				$locM = 'gdktoilet'
 				$menu_loc = 'gdktoilet'
 				$menu_arg = 'womens'
@@ -159,9 +159,9 @@ if $args[0] = 'library':
 			'You finish checking out the novel and start heading towards the exit. <<$npc_firstname[''A231'']>> mentions that she has to use the bathroom before heading home and you say that you might as well go as well.'
 			act 'Go to the bathroom':
 				minut += 5
-				$metka = 'womens'
+				$loc_arg = 'womens'
 				$loc = 'gdktoilet'
-				$metkaM = 'womens'
+				$locM_arg = 'womens'
 				$locM = 'gdktoilet'
 				$menu_loc = 'gdktoilet'
 				$menu_arg = 'womens'

locations/AnalPR.qsrc

@@ -1,8 +1,8 @@
 # AnalPR
 
 if $ARGS[0] = '1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'AnalPR'
     $location_type = 'event'
 	menu_off = 1
 
@@ -40,8 +40,8 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'AnalPR'
     $location_type = 'event'
 	menu_off = 1
 	

locations/BDSM.qsrc

@@ -1,6 +1,6 @@
 # BDSM
-$metka = $ARGS[0]
-$loc = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'BDSM'
 $location_type = 'event'
 menu_off = 1
 *clr & cla

locations/BDSM_Club.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'Hos':
 end
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'BDSM_Club'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'BDSM_Club'

locations/FedorEv3.qsrc

@@ -427,9 +427,9 @@ end
 
 if $ARGS[0] = 'Ladies Room':
 	*clr & cla
-	$metka = 'Ladies Room'
+	$loc_arg = 'Ladies Room'
 	$loc = 'FedorEv3'
-	$metkaM = 'Ladies Room'
+	$locM_arg = 'Ladies Room'
 	$locM = 'FedorEv3'
 	$location_type = 'bathroom'	
 	$locclass = 'restroom'
@@ -459,9 +459,9 @@ end
 		
 if $ARGS[0] = 'Mens Room':
 	*clr & cla
-	$metka = 'Mens Room'
+	$loc_arg = 'Mens Room'
 	$loc = 'FedorEv3'
-	$metkaM = 'Mens Room'
+	$locM_arg = 'Mens Room'
 	$locM = 'FedorEv3'	
 	$location_type = 'bathroom'
 	$locclass = 'restroom'

locations/FedorEv4.qsrc

@@ -2299,9 +2299,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	*clr & cla
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'FedorEv4'
 	killvar '$locclass'
 	$location_type = 'bathroom'
@@ -2443,7 +2443,7 @@ end
 
 if $ARGS[0] = 'Kitchen':
 	$loc = 'FedorEv4'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$locclass = 'kitr'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Kitchen'
@@ -2507,9 +2507,9 @@ if $ARGS[0] = 'Hallway':
 	$menu_arg = 'Hallway'
 	menu_off = 0
 	if hour = 20 and ReginaIntro = 0:gt 'FedorEv4', 'Regina Intro'
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'FedorEv4'
-	$metkaM = 'Hallway'
+	$locM_arg = 'Hallway'
 	$locM = 'FedorEv4'
 	$location_type = 'private'
 	WithFedor = 0
@@ -2559,9 +2559,9 @@ end
 
 if $ARGS[0] = 'Bedroom':
 	*clr & cla
-	$metka = 'Bedroom'
+	$loc_arg = 'Bedroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Bedroom'
+	$locM_arg = 'Bedroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Bedroom'
@@ -2981,9 +2981,9 @@ end
 
 if $ARGS[0] = 'Fedor Livingroom':
 	*clr & cla
-	$metka = 'Fedor Livingroom'
+	$loc_arg = 'Fedor Livingroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Livingroom'
+	$locM_arg = 'Fedor Livingroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Livingroom'
@@ -3014,9 +3014,9 @@ end
 
 if $ARGS[0] = 'Fedor Kitchen':
 	*clr & cla
-	$metka = 'Fedor Kitchen'
+	$loc_arg = 'Fedor Kitchen'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Kitchen'
+	$locM_arg = 'Fedor Kitchen'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Kitchen'
@@ -3067,9 +3067,9 @@ end
 
 if $ARGS[0] = 'Fedor Bedroom':
 	*clr & cla
-	$metka = 'Fedor Bedroom'
+	$loc_arg = 'Fedor Bedroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Bedroom'
+	$locM_arg = 'Fedor Bedroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Bedroom'
@@ -3126,9 +3126,9 @@ end
 
 if $ARGS[0] = 'Fedor Bedroom 2':
 	*clr & cla
-	$metka = 'Fedor Bedroom 2'
+	$loc_arg = 'Fedor Bedroom 2'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Bedroom 2'
+	$locM_arg = 'Fedor Bedroom 2'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Bedroom 2'

locations/FedorMisc.qsrc

@@ -23,7 +23,7 @@ end
 if $ARGS[0] = 'Fedor Chat':
 	*clr & cla
 	menu_off = 1
-	$metka = 'Fedor Chat'
+	$loc_arg = 'Fedor Chat'
 	$loc = 'FedorMisc'
 	numnpc = 5
 	minut += 5
@@ -68,7 +68,7 @@ if $ARGS[0] = 'Fedor Chat':
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 	
 	act 'Chat':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'Fedor Chat':
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 	end
 
@@ -139,7 +139,7 @@ if $ARGS[0] = 'Fedor Hate':
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 end
 
@@ -160,7 +160,7 @@ if $ARGS[0] = 'Comb':
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 
-	act 'Move away':gt $loc, $metka
+	act 'Move away':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'Locker Room':
@@ -465,9 +465,9 @@ end
 
 if $ARGS[0] = 'Restroom':
 	*clr & cla
-	$metka = 'Restroom'
+	$loc_arg = 'Restroom'
 	$loc = 'FedorMisc'
-	$metkaM = 'Restroom'
+	$locM_arg = 'Restroom'
 	$locM = 'FedorMisc'
 	$location_type = 'bathroom'
 	$locclass = 'school_bathroom'

locations/Gnpc.qsrc

@@ -131,7 +131,7 @@ if boytimes[numnpc] > 0 and otnBoyFrend[numnpc] > 40:
 end
 'You approach <<$nameBoyfrend[numnpc]>> and greet him<<$bfGreeting>>.'
 
-act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 
 act 'Take a walk through the park':
 	cla
@@ -168,7 +168,7 @@ act 'Take a walk through the park':
 		'<<$nameBoyfrend[numnpc]>> stammers something and nods his head fearfully while crawling backwards. Then he jumps back on his feet und runs as fast as he can.'
 		'You doubt that you will ever see him again...'
 
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 
 		exit
 	end
@@ -178,12 +178,12 @@ act 'Take a walk through the park':
 	if gboyrand = 0:
 		'<<$nameBoyfrend[numnpc]>> offers to go to the movies.'
 
-		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 		act 'Go to the cinema':gt 'Gnpc_cinema'
 	elseif gboyrand = 1:
 		'<<$nameBoyfrend[numnpc]>> suggests to drink some beers in the park.'
 
-		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 
 		act 'Go for a beer':
 			cla
@@ -234,7 +234,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again. Then you snatch the bills from his hand and leave.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 
 			act 'Dump him and throw the money in his face':
@@ -244,7 +244,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and throw the money in his face before storming off.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 
 		else
@@ -257,7 +257,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and storm off.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 		end
 	end
@@ -288,7 +288,7 @@ if GboyBalabol[numnpc] = 1:
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and storm off.'
 
-				act 'Leave': gt $loc, $metka
+				act 'Leave': gt $loc, $loc_arg
 			end
 		else
 			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -300,7 +300,7 @@ if GboyBalabol[numnpc] = 1:
 			gs 'stat'
 			'You think about what he said. Because of the rumours, a lot of people have already a bad opinion about you and you don''t want to lose your <<$bfTitle[numnpc]>>, too. So you reluctantly decide to forgive him.'
 
-			act 'Leave':gt $loc, $metka
+			act 'Leave':gt $loc, $loc_arg
 		end
 	end
 end
@@ -330,7 +330,7 @@ if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] >
 				gs 'stat'
 				'You tell <<$nameBoyfrend[numnpc]>> that it would be better if you don''t see each other again and that he should''t call you anymore. He just stares at you, so you decide to quickly leave before he overcomes his state of shock.'
 
-				act 'Leave': gt $loc, $metka
+				act 'Leave': gt $loc, $loc_arg
 			end
 		else
 			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -364,7 +364,7 @@ if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] >
 						'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
 					end
 
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 				end
 			else
 				act 'Just be friends (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/HotelAdmin.qsrc

@@ -1,6 +1,6 @@
 # HotelAdmin
-$metka = $ARGS[0]
-$loc = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'HotelAdmin'
 $location_type = 'event'
 menu_off = 1
 

locations/HotelHole.qsrc

@@ -1,7 +1,7 @@
 # HotelHole
 
 CLOSE ALL
-$metka = $ARGS[0]
+$loc_arg = $ARGS[0]
 $prevloc = $loc
 $loc = $CURLOC
 $menu_loc = 'HotelHole'

locations/HotelRoom.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
-	$metkaM = 'normal'
+	$locM_arg = 'normal'
 	$locM = 'HotelRoom'
-	$metka = 'normal'
+	$loc_arg = 'normal'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$location_type = 'private'
@@ -40,9 +40,9 @@ end
 
 if $ARGS[0] = 'better':
 	*clr & cla
-	$metkaM = 'better'
+	$locM_arg = 'better'
 	$locM = 'HotelRoom'
-	$metka = 'better'
+	$loc_arg = 'better'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$menu_loc = 'HotelRoom'
@@ -78,9 +78,9 @@ end
 
 if $ARGS[0] = 'best':
 	*clr & cla	
-	$metkaM = 'best'
+	$locM_arg = 'best'
 	$locM = 'HotelRoom'
-	$metka = 'best'
+	$loc_arg = 'best'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$menu_loc = 'HotelRoom'
@@ -119,9 +119,9 @@ if $ARGS[0] = 'shower1':
 	*clr & cla
 	minut += 1
 	hotelShampoo = 1
-	$metkaM = 'shower1'
+	$locM_arg = 'shower1'
 	$locM = 'HotelRoom'
-	$metka = 'shower1'
+	$loc_arg = 'shower1'
 	$loc = 'HotelRoom'	
 	$location_type = 'bathroom'
 	gs 'themes', 'indoors'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'tv':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv<<hotelroom>>.jpg"></center>'
 	'You turn on the TV and make yourself comfortable on the bed.'
 
-	act 'Get up from the bed':gt $locM, $metkaM
+	act 'Get up from the bed':gt $loc, $loc_arg
 	act 'Watch TV (1:00)': gt 'hotelroom', 'watch_tv'
 end
 
@@ -169,7 +169,7 @@ if $ARGS[0] = 'watch_tv':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv0,'+rand(0,4)+'.jpg"></center>'
 	'You are watching the country''s main television channel. None of their programs are really worth watching, but the distraction is welcome anyway.'
 
-	act 'Get up from the bed':gt $locM, $metkaM
+	act 'Get up from the bed':gt $loc, $loc_arg
 	act 'Watch TV (1:00)': gt 'hotelroom', 'watch_tv'
 end
 

locations/HotelWork.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 end
 
 if $ARGS[0] = 'maid':
-	$metka = 'maid'
+	$loc_arg = 'maid'
 	$loc = 'HotelWork'
 	$menu_loc = 'HotelWork'
 	$menu_arg = 'maid'

locations/IvanEv.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'School Chat':
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 	
 	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'School Chat':
 			gs 'nogorslut'
 			gs 'yesgorslut'
 
-			act 'Move away':gt $loc, $metka
+			act 'Move away':gt $loc, $loc_arg
 		end
 	end
 end

locations/Komp.qsrc

@@ -1847,7 +1847,7 @@ end
 
 if $ARGS[0] = 'fin': 
 	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'dachain': internet = internetS
-	gt $loc, $metka
+	gt $loc, $loc_arg
 end
 
 

locations/LOCA.qsrc

@@ -6,10 +6,8 @@ if settingmode!0: killvar '$cheatmenu'
 msg "Changed Location 
 	$menu_loc		<<$menu_loc>> 
 	$menu_arg		<<$menu_arg>> 
-	$metka			<<$metka>> 
+	$loc_arg			<<$loc_arg>> 
 	$loc			<<$loc>> 
-	$metkaStreet	<<$metkaStreet>> 
-	$locStreet		<<$locStreet>> 
 	$location_type	<<$location_type>> 
 	$locM			<<$locM>>
 	$locclass		<<$locclass>>"

locations/MBallroom.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'ballroom':
     $location_type = 'private'
 	$loc = 'MBallroom'
-	$metka = 'ballroom'
+	$loc_arg = 'ballroom'
 	$menu_loc = 'MBallroom'
 	$menu_arg = 'ballroom'
 	menu_off = 0
@@ -19,7 +19,7 @@ end
 if $ARGS[0] = 'atrium':
     $location_type = 'private'
 	$loc = 'MBallroom'
-	$metka = 'atrium'
+	$loc_arg = 'atrium'
 	$menu_loc = 'MBallroom'
 	$menu_arg = 'atrium'
 	menu_off = 0

locations/MBasement.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	$location_type = 'private'
 	$loc = 'MBasement'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'MBasement'
 	$menu_arg = 'start'
 

locations/MBathrooms.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'bath':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'bath'
+	$loc_arg = 'bath'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'bath'
 	menu_off = 0
@@ -16,7 +16,7 @@ end
 if $ARGS[0] = 'ensuite':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'ensuite'
+	$loc_arg = 'ensuite'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'ensuite'
 	menu_off = 0
@@ -28,7 +28,7 @@ end
 if $ARGS[0] = 'restroom':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'restroom'
+	$loc_arg = 'restroom'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'restroom'
 	menu_off = 0

locations/MConservatory.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MConservatory'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MConservatory'
 $menu_arg = ''
 menu_off = 0

locations/MDining.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MDining'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MDining'
 $menu_arg = ''
 menu_off = 0

locations/MDressing.qsrc

@@ -1,11 +1,11 @@
 # MDressing
-$metka = $ARGS[0]
-$loc = $CURLOC
-$metkaM = $ARGS[0]
-$locM = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'MDressing'
+$locM_arg = $ARGS[0]
+$locM = 'MDressing'
 $location_type = 'private'
 $loc = 'MDressing'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MDressing'
 $menu_arg = ''
 menu_off = 0

locations/MEastbed.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'guestB':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestB'
+	$loc_arg = 'guestB'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestB'
 	menu_off = 0
@@ -74,7 +74,7 @@ if $ARGS[0] = 'guestC':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestC'
+	$loc_arg = 'guestC'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestC'
 	menu_off = 0
@@ -142,7 +142,7 @@ if $ARGS[0] = 'guestD':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestD'
+	$loc_arg = 'guestD'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestD'
 	menu_off = 0

locations/MGames.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MGames'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MGames'
 $menu_arg = ''
 menu_off = 0

locations/MHall.qsrc

@@ -4,7 +4,7 @@ CLOSE ALL
 if $ARGS[0] = 'foyer':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'foyer'
+	$loc_arg = 'foyer'
 	$menu_loc = 'MHall'
 	$menu_arg = 'foyer'
 	menu_off = 0
@@ -36,7 +36,7 @@ end
 if $ARGS[0] = 'west':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'west'
+	$loc_arg = 'west'
 	$menu_loc = 'MHall'
 	$menu_arg = 'west'
 	menu_off = 0
@@ -54,7 +54,7 @@ end
 if $ARGS[0] = 'east':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'east'
+	$loc_arg = 'east'
 	$menu_loc = 'MHall'
 	$menu_arg = 'east'
 	menu_off = 0

locations/MKitchen.qsrc

@@ -4,7 +4,7 @@ $location_type = 'private'
 if $ARGS[0] = 'kitchen':
 	$locclass = 'kitr'
 	$loc = 'MKitchen'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'kitchen'
 	menu_off = 0
@@ -16,7 +16,7 @@ end
 
 if $ARGS[0] = 'laundry':
 	$loc = 'MKitchen'
-	$metka = 'laundry'
+	$loc_arg = 'laundry'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'laundry'
 	menu_off = 0
@@ -28,7 +28,7 @@ end
 
 if $ARGS[0] = 'pantry':
 	$loc = 'MKitchen'
-	$metka = 'pantry'
+	$loc_arg = 'pantry'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'pantry'
 	menu_off = 0

locations/MLanding.qsrc

@@ -5,7 +5,7 @@ killvar '$locclass'
 if $ARGS[0] = 'west':
 	*clr & cla
 	$loc = 'MLanding'
-	$metka = 'west'
+	$loc_arg = 'west'
 	$menu_loc = 'MLanding'
 	$menu_arg = 'west'
 	menu_off = 0
@@ -36,7 +36,7 @@ if $ARGS[0] = 'east':
 	*clr & cla
 	killvar '$locclass'
 	$loc = 'MLanding'
-	$metka = 'east'
+	$loc_arg = 'east'
 	$menu_loc = 'MLanding'
 	$menu_arg = 'east'
 	menu_off = 0

locations/MLibrary.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MLibrary'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MLibrary'
 $menu_arg = ''
 menu_off = 0

locations/MLiving.qsrc

@@ -3,7 +3,7 @@
 $location_type = 'private'
 $locclass = 'livingr'
 $loc = 'MLiving'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MLiving'
 $menu_arg = ''
 menu_off = 0

locations/MRear.qsrc

@@ -3,7 +3,7 @@ $location_type = 'private'
 
 if $ARGS[0] = 'garden':
 	$loc = 'MRear'
-	$metka = 'garden'
+	$loc_arg = 'garden'
 	$menu_loc = 'MRear'
 	$menu_arg = 'garden'
 	menu_off = 0
@@ -223,7 +223,7 @@ end
 if $ARGS[0] = 'garage':
 	*clr & cla
 	$loc = 'MRear'
-	$metka = 'garage'
+	$loc_arg = 'garage'
 	$menu_loc = 'MRear'
 	$menu_arg = 'garage'
 	menu_off = 0

locations/MWestbed.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'master':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MWestbed'
-	$metka = 'master'
+	$loc_arg = 'master'
 	$menu_loc = 'MWestbed'
 	$menu_arg = 'master'
 	menu_off = 0
@@ -70,7 +70,7 @@ if $ARGS[0] = 'guest':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MWestbed'
-	$metka = 'guest'
+	$loc_arg = 'guest'
 	$menu_loc = 'MWestbed'
 	$menu_arg = 'guest'
 	menu_off = 0

locations/MagEncounterFairy.qsrc

@@ -6,20 +6,20 @@ if $ARGS[0] = '':
 	if knowsfairy = 1:
 		if fairyshoo = 0:
 			act 'Look for the fairy to chat': gt 'MagEncounterFairy', 'fairy_chat'
-			act 'Just be on your way': gt $loc, $metka
+			act 'Just be on your way': gt $loc, $loc_arg
 		else
 			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
-			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $loc_arg
 			act 'Shoo the pesky fairy away': gt 'MagEncounterFairy', 'fairy_shoo'
 		end
 	elseif pcs_magik + rand (1,10) >= 8:
 		act 'Investigate the strange glow': gt 'MagEncounterFairy', 'fairy_chat_no1'
 		act 'Shoo the pesky firefly away': gt 'MagEncounterFairy', 'fairy_shoo'
-		act 'Ignore the firefly': fairyskip = 1 & gt $loc, $metka
+		act 'Ignore the firefly': fairyskip = 1 & gt $loc, $loc_arg
 	else
 		gs 'stat'
 		'You have the strange feeling of being watched, but looking around you don''t see anybody.'
-		act 'Shake off the feeling and move on': fairyskip = 1 & gt $loc, $metka
+		act 'Shake off the feeling and move on': fairyskip = 1 & gt $loc, $loc_arg
 	end
 end
 
@@ -51,7 +51,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 		else
 			'The fairy waves goodbye to you and flies away.'
 		end
-		act 'Wave goodbye':gt $loc, $metka
+		act 'Wave goodbye':gt $loc, $loc_arg
 	end
 end
 
@@ -68,14 +68,14 @@ if $ARGS[0] = 'fairy_shoo':
 		'Stunned by surprise you take a closer look at what you thought was a firefly. In the glow you can see a small woman with fluttering wings on her back. It''s a fairy! Taking advantage of your bewilderment she blows something sparkling in your face. Flabbergasted as you are you inhale the substance.'
 		'Instantly you become completely horny and your face flushes with arousal.'
 		'"Maybe this will teach you." she says with a pout and flies off.'
-		act 'Move along':gt $loc, $metka
+		act 'Move along':gt $loc, $loc_arg
 	else
 		fairyshoo += 1
 		pcs_horny = 90
 		fairycurse = daystart + (fairyshoo - 1) * 2
 		gs 'stat'
 		'"Still a meanie, I see!", squeals the fairy "Well, have it your way."'
-		act 'Get away from the fairy': gt $loc, $metka
+		act 'Get away from the fairy': gt $loc, $loc_arg
 	end
 end
 
@@ -125,7 +125,7 @@ if $ARGS[0] = 'fairy_chat':
 				cla
 				*nl
 				'You look at her, puzzled, wondering if you heard her right.  She just shrugs her shoulders and says "Okay, if you''re not interested"'
-				act 'Go on your way': gt $loc, $metka
+				act 'Go on your way': gt $loc, $loc_arg
 			end
 			act 'Sure':
 				cla
@@ -184,7 +184,7 @@ if $ARGS[0] = 'fairy_chat':
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
 					'You suddenly feel colder and less aroused then before.'
 				end
-				act 'Go on your way': gt $loc, $metka
+				act 'Go on your way': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'fairychattopic':
 		end
 	end
 
-	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka
+	act 'Go on your way': killvar 'frandchat' & gt $loc, $loc_arg
 
 end
 

locations/MeynoldHome.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'Aftermath 2':
 end	
 
 if $ARGS[0] = 'Hallway':
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'NikoMeyHome'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Hallway'
@@ -174,7 +174,7 @@ end
 if $ARGS[0] = 'Kitchen':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Kitchen'
 	menu_off = 0
@@ -202,7 +202,7 @@ end
 if $ARGS[0] = 'Lounge':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Lounge'
+	$loc_arg = 'Lounge'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Lounge'
 	menu_off = 0
@@ -247,7 +247,7 @@ end
 if $ARGS[0] = 'Katja Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Katja Room'
+	$loc_arg = 'Katja Room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Katja Room'
 	menu_off = 0
@@ -287,7 +287,7 @@ end
 if $ARGS[0] = 'Vicky Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Vicky room'
+	$loc_arg = 'Vicky room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Vicky room'
 	menu_off = 0
@@ -812,8 +812,8 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	$locM = 'NikoMeyHome'
-	$metkaM = 'Bathroom'
-	$metka = 'Bathroom'
+	$locM_arg = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Bathroom'
 	menu_off = 0

locations/Military.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'Military'
 	$sexloc = 'Military'
 	$menu_loc = 'Military'

locations/NewCloShop.qsrc

@@ -2,7 +2,7 @@
 $location_type = 'event'
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'NewCloShop'
 	$menu_loc = 'NewCloShop'
 	$menu_arg = 'start'
@@ -31,7 +31,7 @@ end
 
 if $ARGS[0] = 'changingroom':
 	$locclass = 'changingroom'
-	$metka = 'changingroom'
+	$loc_arg = 'changingroom'
 	$loc = 'NewCloShop'
 	$menu_loc = 'NewCloShop'
 	$menu_arg = 'changingroom'
@@ -126,7 +126,7 @@ end
 
 if $ARGS[0] = 'dressingclothes':
 	*clr & cla
-	$metka = 'dressingclothes'
+	$loc_arg = 'dressingclothes'
 	$loc = 'NewCloShop'
 	!clorand = rand(1,ARRSIZE('expensive'))
 	!gt 'clothing', 'view_clothing_item', 'shop', 'expensive', clorand, 8000
@@ -177,7 +177,7 @@ if $ARGS[0] = 'dressingshmotmag':
 end
 
 if $ARGS[0] = 'dressingbra':
-	$metka = 'dressingbra'
+	$loc_arg = 'dressingbra'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -218,7 +218,7 @@ if $ARGS[0] = 'changingend':
 end
 
 if $ARGS[0] = 'dressingpanties':
-	$metka = 'dressingpanties'
+	$loc_arg = 'dressingpanties'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -251,7 +251,7 @@ end
 
 
 if $ARGS[0] = 'purses':
-	$metka = 'purses'
+	$loc_arg = 'purses'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla

locations/NikoDates.qsrc

@@ -848,9 +848,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	*clr & cla
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'NikoDates'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'NikoDates'
 	$location_type = 'bathroom'
 	minut += 5

locations/NikoMeyHome.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'Aftermath 2':
 end	
 
 if $ARGS[0] = 'Hallway':
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'NikoMeyHome'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Hallway'
@@ -174,7 +174,7 @@ end
 if $ARGS[0] = 'Kitchen':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Kitchen'
 	menu_off = 0
@@ -202,7 +202,7 @@ end
 if $ARGS[0] = 'Lounge':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Lounge'
+	$loc_arg = 'Lounge'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Lounge'
 	menu_off = 0
@@ -247,7 +247,7 @@ end
 if $ARGS[0] = 'Katja Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Katja Room'
+	$loc_arg = 'Katja Room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Katja Room'
 	menu_off = 0
@@ -287,7 +287,7 @@ end
 if $ARGS[0] = 'Vicky Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Vicky room'
+	$loc_arg = 'Vicky room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Vicky room'
 	menu_off = 0
@@ -814,8 +814,8 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	$locM = 'NikoMeyHome'
-	$metkaM = 'Bathroom'
-	$metka = 'Bathroom'
+	$locM_arg = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Bathroom'
 	menu_off = 0

locations/NikoSlut.qsrc

@@ -1406,9 +1406,9 @@ end
 
 if $ARGS[0] = 'Mens Restroom':
 	*clr & cla
-	$metka = 'Mens Restroom'
+	$loc_arg = 'Mens Restroom'
 	$loc = 'NikoSlut'
-	$metkaM = 'Mens Restroom'
+	$locM_arg = 'Mens Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
 	$locclass = 'restroom'
@@ -1426,9 +1426,9 @@ end
 
 if $ARGS[0] = 'Ladies Restroom':
 	*clr & cla
-	$metka = 'Ladies Restroom'
+	$loc_arg = 'Ladies Restroom'
 	$loc = 'NikoSlut'
-	$metkaM = 'Ladies Restroom'
+	$locM_arg = 'Ladies Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
 	$locclass = 'restroom'
@@ -1463,7 +1463,7 @@ if $ARGS[0] = 'Wash':
 	if NikoSlut > 1:
 		act 'Dry off':gt 'NikoSlut', 'Customers'
 	else
-		act 'Dry off':gt $loc, $metka
+		act 'Dry off':gt $loc, $loc_arg
 	end
 end
 

locations/NormPR.qsrc

@@ -2,7 +2,7 @@
 $location_type = 'event'
 
 if $ARGS[0] = '1':
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'NormPR'
 	menu_off = 1
 
@@ -32,7 +32,7 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'NormPR'
 	menu_off = 1
 

locations/Nudelake.qsrc

@@ -1,7 +1,7 @@
 # Nudelake
 
 $loc = 'Nudelake'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'Nudelake'
 $menu_arg = ''
 menu_off = 0

locations/Palatka.qsrc

@@ -3,7 +3,7 @@ $location_type = 'event'
 
 if $ARGS[0] = 'start':
 	$sexloc = 'Palatka'
-	$metkaM = 'start'
+	$locM_arg = 'start'
 	$locM = 'Palatka'
 	$menu_loc = 'Palatka'
 	$menu_arg = 'start'

locations/ParChurch.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	$loc = 'ParChurch'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'ParChurch'
 	$menu_arg = 'start'
 	$location_type = 'public_indoors'

locations/ParkKafe.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start':
 	$loc = 'ParkKafe'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'ParkKafe'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -26,7 +26,7 @@ end
 if $ARGS[0] = 'table':
 	*clr & cla
 	$loc = 'ParkKafe'
-	$metka = 'table'
+	$loc_arg = 'table'
 	$menu_loc = 'ParkKafe'
 	$menu_arg = 'table'
 	menu_off = 0

locations/Prostitute.qsrc

@@ -2,10 +2,10 @@
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'Prostitute'
 	$metkaSex = $ARGS[0]
-	$locSex = $CURLOC
+	$locSex = 'Prostitute'
 	menu_off = 1
 	cls
 	minut += 5

locations/Snpc.qsrc

@@ -30,7 +30,7 @@ end
 ''
 ''
 
-!!act 'Move away':gt $loc, $metka
+!!act 'Move away':gt $loc, $loc_arg
 
 gs 'cumreaction'
 
@@ -48,7 +48,7 @@ if grupTipe[numnpc] = 5 and grupTipe ! 5:
 				'You mocked the school outcast, as the other students laugh at them.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $metka
+				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
 			end
 		else
 			act 'Mock (<<will_cost>> Willpower)':
@@ -58,7 +58,7 @@ if grupTipe[numnpc] = 5 and grupTipe ! 5:
 				'You began to mock them, but <<$npc_firstname[$static_num]>> answered you. "You''re one to talk cocksucker, everyone knows your the easiest fuck in town." Everyone started laughing at you. You were shocked and confused by everyone turning on you, you hurry away as the others start to talk about you.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $metka
+				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
 			end
 		end
 	else
@@ -103,7 +103,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
-				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
+				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $loc_arg
 				
 				act 'Drink the beer':
 					*clr & cla
@@ -113,7 +113,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					gs 'stat'
 					'You happily take the beer, and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
 
-					act 'Move away':gt $loc, $metka
+					act 'Move away':gt $loc, $loc_arg
 				end
 			end
 		elseif pav_slut >= 300:
@@ -123,7 +123,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 				'<<$npc_firstname[''A<<numnpc>>'']>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
 			end
 
-			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
+			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $loc_arg
 		end
 
 		exit
@@ -218,7 +218,7 @@ if numnpc = 23:
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -247,7 +247,7 @@ end
 if $loc ! 'gdkin':
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 else
-	act 'Move away': gt $loc, $metka
+	act 'Move away': gt $loc, $loc_arg
 end
 
 !!Chat
@@ -267,7 +267,7 @@ act 'Chat':
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 
 		exit
@@ -282,7 +282,7 @@ act 'Chat':
 		gs 'nogorslut'
 		gs 'yesgorslut'
 		
-		act 'Move away':gt $loc, $metka
+		act 'Move away':gt $loc, $loc_arg
 	end
 end
 
@@ -293,7 +293,7 @@ if numnpc = 13 and lariskaHelp = -1:
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 end
 
@@ -319,7 +319,7 @@ if numnpc = 2:
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -357,7 +357,7 @@ if numnpc = 12:
 			if $loc ! 'gdkin':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -381,7 +381,7 @@ if numnpc = 14:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -422,7 +422,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 
@@ -435,7 +435,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 
@@ -448,7 +448,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 		end
@@ -471,7 +471,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			else
 				*clr & cla
@@ -499,7 +499,7 @@ if numnpc = 14:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -538,7 +538,7 @@ if numnpc = 16:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -569,7 +569,7 @@ if numnpc = 16:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 		end
@@ -589,7 +589,7 @@ if numnpc = 31:
 		if $loc ! 'gdkin':
 			xgt 'gschool_lessons', 'short_break', 'nopict'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 	end
 end
@@ -611,7 +611,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_rel['A<<numnpc>>'] >= 100 and grupTipe = 3 and npc_QW['A<<numnpc>>'] = 2 and schoolprogul > 0:
@@ -629,7 +629,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_rel['A<<numnpc>>'] >= 100 and npc_QW['A<<numnpc>>'] = 4:
@@ -651,7 +651,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 		act 'Chicken Out':
@@ -664,7 +664,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_QW['A<<numnpc>>'] > 5:
@@ -684,7 +684,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end

locations/TV.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -37,7 +37,7 @@ if $ARGS[0] = 'nokable':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
-	act 'Turn off the TV and get off the couch': gt $loc, $metka
+	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'kable':
@@ -51,7 +51,7 @@ if $ARGS[0] = 'kable':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
-	act 'Turn off the TV and get off the couch': gt $loc, $metka
+	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pav':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'pav':
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
-			act 'Continue': gt $loc, $metka
+			act 'Continue': gt $loc, $loc_arg
 		end
 	end
 end
@@ -101,7 +101,7 @@ if $ARGS[0] = 'gad':
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
-			act 'Continue': gt $loc, $metka
+			act 'Continue': gt $loc, $loc_arg
 		end
 	end
 end

locations/Vika.qsrc

@@ -19,14 +19,14 @@ else
 	'The two of you are best friends.'
 end
 ''
-act '<B>Move away</B>':gt $loc, $metka
+act '<B>Move away</B>':gt $loc, $loc_arg
 
 if vika_sleep = 1 and vikaslut = 0:
 	cls
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
 	'Vika is sleeping in her bed, after a night of adventures. While watching her, you wonder what all she got up to tonight.'
-	act '<B>Move away</B>':gt $loc, $metka
+	act '<B>Move away</B>':gt $loc, $loc_arg
 	exit
 end
 
@@ -35,7 +35,7 @@ if vika_sleep = 1 and vikaslut = 1:
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
 	'Vika is sleeping in her bed, naked. You wonder if she worked in the brothel tonight, to pay for her tuition.'
-	act '<B>Move away</B>':gt $loc, $metka
+	act '<B>Move away</B>':gt $loc, $loc_arg
 	exit
 end
 

locations/VolkovHome.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'Niko Bedroom':
 	cls
-	$metka = 'Niko Bedroom'
+	$loc_arg = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
 	$location_type = 'private'
@@ -19,7 +19,7 @@ end
 
 if $ARGS[0] = 'Hallway 2':
 	cls
-	$metka = 'Niko Bedroom'
+	$loc_arg = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
 	$location_type = 'private'
@@ -40,9 +40,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	cls
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'NikoDates'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'NikoDates'
 	$location_type = 'bathroom'
 	minut += 5

locations/VolleyTrenerSpeak.qsrc

@@ -67,6 +67,6 @@ else
 end
 !------------------------------------------Included in the line--------------------------------------
 
-act 'Move away':gt $loc, $metka
+act 'Move away':gt $loc, $loc_arg
 --- VolleyTrenerSpeak ---------------------------------
 

locations/WorkHosp.qsrc

@@ -1,7 +1,7 @@
 # WorkHosp
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'WorkHosp'
 	$sexloc = 'WorkHosp'
     $location_type = 'event'

locations/_buy_item.qsrc

@@ -6,7 +6,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 
 count = ARGS[0]
 $item = $ARGS[1]

locations/_buy_single_item.qsrc

@@ -7,7 +7,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 
 dynamic "set <<$ARGS[3]>> = <<ARGS[0]>>"
 set money -= ARGS[2]

locations/_single_stock_item.qsrc

@@ -8,7 +8,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 !! ARGS 6 > 0 to  force-disable buy link
 !! ARGS 7 is replacement text for 6
 !! ARGS 8 is custom buy link when ARGS 6 > 0

locations/_stock_item.qsrc

@@ -8,7 +8,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 !! ARGS 6 > 0 to  force-disable buy link
 !! ARGS 7 is replacement text for 6
 !! ARGS 8 is custom buy link when ARGS 6 > 0

locations/abduction.qsrc

@@ -1,7 +1,7 @@
 # abduction
 
 $location_type = 'private'
-$metka = 'start'
+$loc_arg = 'start'
 $loc = 'abduction'
 
 if $ARGS[0] = 'start':
@@ -81,7 +81,7 @@ end
 
 if $ARGS[0] = 'abdRoom':
 	$loc = 'abduction'
-	$metka = 'abdRoom'
+	$loc_arg = 'abdRoom'
 	$menu_loc = 'abduction'
 	$menu_arg = 'abdRoom'
 	menu_off = 0
@@ -572,8 +572,8 @@ end
 if $ARGS[0] = 'abdFood':
 	$loc = 'abduction'
 	$locM = 'abduction'
-	$metka = 'abdFood'
-	$metkaM = 'abdFood'
+	$loc_arg = 'abdFood'
+	$locM_arg = 'abdFood'
 	$menu_loc = 'abduction'
 	$menu_arg = 'abdFood'
 	menu_off = 0

locations/agentned.qsrc

@@ -4,8 +4,8 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'start'
@@ -69,8 +69,8 @@ end
 
 if $ARGS[0] = 'buy':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'buy'
@@ -113,8 +113,8 @@ end
 
 if $ARGS[0] = 'sell':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'sell'
@@ -248,8 +248,8 @@ end
 
 if $ARGS[0] = 'rent':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'rent'

locations/albinaEv.qsrc

@@ -139,7 +139,7 @@
 ! 	end
 ! end
 
-! act 'Move away':gt $loc, $metka
-gt $loc, $metka
+! act 'Move away':gt $loc, $loc_arg
+gt $loc, $loc_arg
 --- albinaEv ---------------------------------
 

locations/andreihunter.qsrc

@@ -28,7 +28,7 @@ act 'Chat (0:30)':
 	if huntersAndreiQw >= 0:'You chat with Andrei. You learn interesting tidbits about hunting from him.'
 	if huntersAndreiQw < 0:'You talk to Andrei. He makes it clear he''d rather not talk to you, but takes part in the conversation anyway.'
 
-	act'Continue':gt $loc, $metka
+	act'Continue':gt $loc, $loc_arg
 end
 
 if huntersAndreiQw >= 10:
@@ -91,7 +91,7 @@ if huntersAndreiQw >= 10:
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
 							'"Maybe next time we won''t stop there, <<$pcs_nickname>>", Andrei says when your lips finally part. "For now though, let''s go back."'
 
-							act'Continue':gt $loc, $metka
+							act'Continue':gt $loc, $loc_arg
 						end
 					end
 				end
@@ -105,10 +105,10 @@ if huntersAndreiQw >= 10:
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'"Sorry... Andrei... I can''t right now", you tell him. He leaves with an angry look on his face.'
 
-					act'Leave':gt $loc, $metka
+					act'Leave':gt $loc, $loc_arg
 				end
 			else
-				act'Leave':gt $loc, $metka
+				act'Leave':gt $loc, $loc_arg
 			end
 		end
 	else
@@ -128,7 +128,7 @@ if huntersAndreiQw >= 10:
 
 			gs 'stat'
 
-			act'Leave':gt $loc, $metka
+			act'Leave':gt $loc, $loc_arg
 		end
 	end
 end
@@ -182,7 +182,7 @@ if huntersAndreiLove > 0 and pcs_horny <= 60 and huntersAndreiQw >= 10 and temp
 
 		'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 		'"No, Andrei not now." You quickly leave back the way you came.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	end
 end
 
@@ -197,11 +197,11 @@ if huntersAndreiLove > 0:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
 		'"Andrei, I feel that our relationship has no future. I''m breaking up with you", you say. You leave while trying not to look back at him.'
 
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	end
 end
 
-act'Leave':gt $loc, $metka
+act'Leave':gt $loc, $loc_arg
 
 if huntersAndreiQw < 10 and huntersAndreiLove > 0:
 	*clr & cla
@@ -214,7 +214,7 @@ if huntersAndreiQw < 10 and huntersAndreiLove > 0:
 	'"<<$pcs_nickname>>, It''s over between us," he says firmly and walks away.'
 	'"Well , maybe it''s for the best," you think as you leave in the other direction.'
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 end
 
 --- andreihunter ---------------------------------

locations/anushapt.qsrc

@@ -19,10 +19,10 @@ if $ARGS[0] = 'home':
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$locM_arg = $ARGS[0]
+	$locM = 'anushapt'
+	$loc_arg = $ARGS[0]
+	$loc = 'anushapt'
 	$location_type = 'private'
 	clr
 	popolaini = 0
@@ -314,9 +314,9 @@ if $ARGS[0] = 'bathroom':
 	CLOSE ALL
 	$menu_loc = 'anushapt'
 	$menu_arg = 'bathroom'
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'anushapt'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'anushapt'
 	menu_off = 0
 	*clr & cla
@@ -404,9 +404,9 @@ if $ARGS[0] = 'nushshower':
 	menu_off = 1
 	CLOSE ALL
 	*clr & cla
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'anushapt'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'anushapt'
 	gs 'stat'
 	$location_type = 'bathroom'
@@ -1525,7 +1525,7 @@ end
 
 if $ARGS[0] = 'kitchen':
 	$loc = 'anushapt'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$menu_loc = 'anushapt'
 	$menu_arg = 'kitchen'
 	menu_off = 0

locations/artemhome.qsrc

@@ -36,9 +36,9 @@ if $ARGS[0] = 'home':
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$metkaM = 'home'
+	$locM_arg = 'home'
 	$locM = 'artemhome'
-	$metka = 'home'
+	$loc_arg = 'home'
 	$loc = 'artemhome'
 	$location_type = 'private'
 	clr
@@ -173,9 +173,9 @@ if $ARGS[0] = 'hallway':
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$location_type = 'indoors'
-	$metkaM = 'hallway'
+	$locM_arg = 'hallway'
 	$locM = 'artemhome'
-	$metka = 'hallway'
+	$loc_arg = 'hallway'
 	$loc = 'artemhome'
 	*clr & cla
 	minut += 1
@@ -207,9 +207,9 @@ if $ARGS[0] = 'bathroom':
 	CLOSE ALL
 	$menu_loc = 'artemhome'
 	$menu_arg = 'bathroom'
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'artemhome'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'artemhome'
 	if ArtemLoc ! 3:
 		menu_off = 0
@@ -265,9 +265,9 @@ end
 if $ARGS[0] = 'artemroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemroom'
-	$metkaM = 'artemroom'
+	$locM_arg = 'artemroom'
 	$locM = 'artemhome'
-	$metka = 'artemroom'
+	$loc_arg = 'artemroom'
 	$loc = 'artemhome'
 	menu_off = 0
 	$locclass = 'bedr'
@@ -584,9 +584,9 @@ end
 if $ARGS[0] = 'livingroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'livingroom'
-	$metkaM = 'livingroom'
+	$locM_arg = 'livingroom'
 	$locM = 'artemhome'
-	$metka = 'livingroom'
+	$loc_arg = 'livingroom'
 	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL
@@ -862,9 +862,9 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$metkaM = 'kitchen'
+	$locM_arg = 'kitchen'
 	$locM = 'artemhome'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$loc = 'artemhome'
 	$menu_loc = 'artemhome'
 	$menu_arg = 'kitchen'
@@ -1126,9 +1126,9 @@ end
 if $ARGS[0] = 'artemparents':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemparents'
-	$metkaM = 'artemparents'
+	$locM_arg = 'artemparents'
 	$locM = 'artemhome'
-	$metka = 'artemparents'
+	$loc_arg = 'artemparents'
 	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL

locations/autosalonF.qsrc

@@ -1,7 +1,7 @@
 # autosalonF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autosalonF'
     $location_type = 'event'
 	menu_off = 1
 	cla
@@ -46,8 +46,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'manager1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autosalonF'
 	$menu_arg = 'manager1'
 	$menu_loc = 'autosalonF'
 	menu_off = 0

locations/autoservisF.qsrc

@@ -1,7 +1,7 @@
 # autoservisF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autoservisF'
     $location_type = 'event'
 	$menu_arg = 'start'
 	$menu_loc = 'autoservisF'

locations/autotraidF.qsrc

@@ -1,7 +1,7 @@
 # autotraidF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
     $location_type = 'event'
 	$menu_arg = 'start'
 	$menu_loc = 'autotraidF'
@@ -26,8 +26,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'manager1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
 	$menu_arg = 'manager1'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
@@ -75,8 +75,8 @@ if $ARGS[0] = 'manager1':
 end
 
 if $ARGS[0] = 'car':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
 	$menu_arg = 'car'
 	$menu_loc = 'autotraidF'
 	menu_off = 0

locations/backwater.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'secluded'
 $loc = 'backwater'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'backwater'
 $menu_arg = ''
 menu_off = 0
@@ -15,7 +15,7 @@ if $ARGS[0] = '':
 	act 'Go back to the hut':
 	if $clothingworntype = 'nude' and ((hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1) or (inhibitioncheck !  daystart and pcs_inhib >= 25) or exhibitionist_lvl < 1):
 		$loc = 'swamp_yard'
-		$metka = 'start'
+		$loc_arg = 'start'
 		hunter_refuse = 0
 		inhibitionbackwater = daystart
 		gs 'stat'
@@ -110,7 +110,7 @@ end
 			*nl
 			'You wash off the indecent inscriptions on your body.'
 
-			act 'Finish':menu_off = 0 & gt $loc, $metka
+			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
 	if cumloc[6] = 1 or cumloc[7] = 1:
@@ -192,7 +192,7 @@ end
 				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater'
 				'You pick up your clothes laying on the ground.'
-				gt $loc, $metka
+				gt $loc, $loc_arg
 			end
 		elseif forced_naked_day < daystart:
 			act 'Get dressed':
@@ -202,7 +202,7 @@ end
 				gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 				gs 'underwear', 'wear'
 				'You pick up your clothes laying on the ground and get dressed.'
-				gt $loc, $metka
+				gt $loc, $loc_arg
 			end
 		end
 	end

locations/bank.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'bank'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'bank'
 	$menu_arg = 'start'
 	menu_off = 0

locations/bass.qsrc

@@ -2,8 +2,8 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'bass'
     $location_type = 'public_indoors'
 	$menu_loc = 'bass'
 	$menu_arg = 'start'

locations/bed2.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = '':
 			killvar '$sleep_txt'
 		end
 	end
-	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $metka
+	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $loc_arg
 	act 'Take a nap (1:00)':
 		menu_off = 1
 		if pcs_sleep >= 10 and pcs_sleep <= 90:
@@ -530,7 +530,7 @@ if $ARGS[0] = 'end':
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
 	else
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -644,7 +644,7 @@ if $ARGS[0] = 'succubinit':
 		RecovH = 0		
 	end
 
-	act 'Finish': gt $loc, $metka
+	act 'Finish': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'magbstchoice':

locations/bedr.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedr'
-$metka = ''
+$loc_arg = ''
 $locM = 'bedr'
-$metkaM = ''
+$locM_arg = ''
 $menu_loc = 'bedr'
 $menu_arg = ''
 menu_off = 0

locations/bedr2x.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedr2x'
-$metka = ''
+$loc_arg = ''
 $locM = 'bedr2x'
-$metkaM = ''
+$locM_arg = ''
 $menu_loc = 'bedr2x'
 $menu_arg = ''
 menu_off = 0

locations/bedrPar.qsrc

@@ -3,7 +3,7 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedrPar'
-$metka = ''
+$loc_arg = ''
 $location_type = 'private'
 $locclass = 'bedr'
 $menu_loc = 'bedrPar'
@@ -24,7 +24,7 @@ if momloc = 26:
 		gt 'mother', 'plug_find'
 	else
 		'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
-		act 'Leave': gt $loc, $metka
+		act 'Leave': gt $loc, $loc_arg
 	end
 end
 
@@ -35,7 +35,7 @@ if ParrotQW['Level'] = 2:
 	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
 	ParrotQW['Level'] = 3
 	ParrotQW['Day'] = 3
-	act 'Continue':gt $loc, $metka
+	act 'Continue':gt $loc, $loc_arg
 	exit
 end
 if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
@@ -47,7 +47,7 @@ if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	ParrotQW['Level'] = 0
 	ParrotQW['Day'] = 2
 	ParrotQW['Failed'] = 0
-	act 'Continue':gt $loc, $metka
+	act 'Continue':gt $loc, $loc_arg
 	exit
 end
 
@@ -72,7 +72,7 @@ if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 		ParrotQW['Owned2'] = 0
 	end
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 	exit
 end
 
@@ -423,7 +423,7 @@ act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':
 	cla & *clr
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'korrPar'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
 	grandmaQW['last_month_paid'] = month

locations/bedrPar2.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = '':
 	CLOSE ALL
 	*clr & cla
 	$loc = 'bedrPar2'
-	$metka = ''
+	$loc_arg = ''
 	$locclass = 'bedr'
 	$location_type = 'private'
 	$menu_loc = 'bedrPar2'
@@ -56,7 +56,7 @@ if $ARGS[0] = 'kamasutra':
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/book.jpg"></center>'
 	'The cover says "Kamasutra"'
-	act 'Leave': gt $loc, $metka
+	act 'Leave': gt $loc, $loc_arg
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
 end
 
@@ -68,7 +68,7 @@ if $args = 'read_book':
 	minut += 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/books/kamasutra/ik' + kamasutra_page + '.jpg"></td></tr><tr><td align=center>'+iif(kamasutra_page < 1, '', '<a href="exec: kamasutra_page-=1 & gt''bedrPar2'',''read_book''"><br>Previous page</a>')+'</td><td align=center>'+iif(kamasutra_page > 45, '', '<a href="exec: kamasutra_page+=1 & gt''bedrPar2'',''read_book''"><br>Next page</a>')+'</center>'
-	act 'Close the book': gt $loc, $metka
+	act 'Close the book': gt $loc, $loc_arg
 	if pcs_horny >= 60 and week = 6 and family_trip = 1: act 'Masturbate': gt 'selfplay', 'start'
 end
 
@@ -77,7 +77,7 @@ if $ARGS[0] = 'parents_wardrobe':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
-	act 'Leave ': gt $loc, $metka
+	act 'Leave ': gt $loc, $loc_arg
 	act 'Rummage': gt 'bedrPar2', 'wardrobe_search'
 end
 
@@ -85,7 +85,7 @@ if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
 	if (hour >= 21 or hour < 6) and indorf = 0:
 		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!'
-		act 'Leave ': gt $loc, $metka
+		act 'Leave ': gt $loc, $loc_arg
 		exit
 	end
 	if rand(1,100) > 75:
@@ -103,7 +103,7 @@ if $ARGS[0] = 'wardrobe_search':
 		*pl $findmomtoy[rand(0,2)]
 		killvar '$findmomtoy'
 	end
-	act 'Close the Cabinet': gt $loc, $metka
+	act 'Close the Cabinet': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'momtoy_play':
@@ -114,7 +114,7 @@ if $ARGS[0] = 'momtoy_play':
 	selfmomtoyplay = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
 	if pcs_horny < 70:
-		act 'Put it back': gt $loc, $metka
+		act 'Put it back': gt $loc, $loc_arg
 	else
 		act 'Play with it': gt 'selfplay', 'start'
 	end

locations/begin.qsrc

@@ -1,7 +1,7 @@
 # begin
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'begin'
 	gs 'Cheatmenu_din'
 	showstat 1

locations/beverage.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'bev_kva':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -59,7 +59,7 @@ if $ARGS[0] = 'bev_jui':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -89,7 +89,7 @@ if $ARGS[0] = 'bev_mil':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -117,7 +117,7 @@ if $ARGS[0] = 'bev_wat':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -147,7 +147,7 @@ if $ARGS[0] = 'bev_cof':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -177,7 +177,7 @@ if $ARGS[0] = 'bev_tea':
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -196,11 +196,11 @@ if $ARGS[0] = 'bev_vod':
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -219,11 +219,11 @@ if $ARGS[0] = 'bev_bla':
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish': gt $loc, $metka
+			act 'Finish': gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -242,11 +242,11 @@ if $ARGS[0] = 'bev_sco':
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -265,11 +265,11 @@ if $ARGS[0] = 'bev_win':
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -289,11 +289,11 @@ if $ARGS[0] = 'bev_mar':
 		if food_loc = 1:
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -312,11 +312,11 @@ if $ARGS[0] = 'bev_cha':
 		if food_loc = 1:
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -334,11 +334,11 @@ if $ARGS[0] = 'bev_bee':
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 	else
 		msg 'You don''t feel well enough to drink alcohol.'
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 

locations/blowPR.qsrc

@@ -1,8 +1,8 @@
 # blowPR
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'blowPR'
     $location_type = 'event'
 	menu_off = 1
 	*clr & cla
@@ -19,8 +19,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = '1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'blowPR'
     $location_type = 'event'
 	protect = 1
 	gs 'dinSex', 'std_trigger_oral'
@@ -59,8 +59,8 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'blowPR'
     $location_type = 'event'
 	*clr & cla
 	menu_off = 1
@@ -76,8 +76,8 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = '12':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'blowPR'
     $location_type = 'event'
 	*clr & cla
 	menu_off = 1

locations/boilerroom.qsrc

@@ -1,8 +1,8 @@
 # boilerroom
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'boilerroom'
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/qwest/alter/boiler/boilerroom'+ rand(1,3) +'.jpg"></center>'

locations/bordel.qsrc

@@ -22,7 +22,7 @@ end
 
 if $ARGS[0] = 'brothel':
 	$sexloc = 'bordel'
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'bordel'
     $location_type = 'private'
 	$menu_loc = 'bordel'
@@ -69,9 +69,9 @@ if $ARGS[0] = 'brothel':
 end
 
 if $ARGS[0] = 'dysh':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$metkaM = 'dysh'
+	$loc_arg = $ARGS[0]
+	$loc = 'bordel'
+	$locM_arg = 'dysh'
 	$locM = 'bordel'
     $location_type = 'bathroom'
 	$locclass = 'restroom'

locations/bouling.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	$sexloc = 'bouling'
 	*clr & cla
 	$loc = 'bouling'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'bouling'
 	$menu_arg = 'start'
 	menu_off = 0

locations/bras.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'view_bra_list':
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'
 	else
-		act 'Return': gt $loc, $metka
+		act 'Return': gt $loc, $loc_arg
 	end
 
 	if $ARGS[1] = 'wardrobe':
@@ -145,17 +145,17 @@ if $ARGS[0] = 'view_bra_item':
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_bras[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
-			act 'Leave': gt $loc, $metka
+			act 'Leave': gt $loc, $loc_arg
 		else
 			price = ARGS[4]
 			'Price: <<ARGS[4]>> <b>₽</b>'
-			act 'Leave': gt $loc, $metka
+			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
 					money -= price
 					dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-					gt $loc, $metka
+					gt $loc, $loc_arg
 				end
 			else
 				'You do not have enough cash to buy this bra.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'view_bra_item':
 					karta -= price
 					dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-					gt $loc, $metka
+					gt $loc, $loc_arg
 				end
 			else
 				'You do not have enough money in your bank to buy this bra.'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'view_bra_item':
 							if $ARGS[1] = 'wardrobe':
 								gt 'wardrobe', 'start'
 							else
-								gt $loc, $metka
+								gt $loc, $loc_arg
 							end
 						end
 					end

locations/brothel.qsrc

@@ -74,8 +74,8 @@ if $ARGS[0] = 'lobby:toilet':
 	cla
 	*clr
 	$locM = 'brothel'
-	$metka = 'lobby:toilet'
-	$metkaM = 'lobby:toilet'
+	$loc_arg = 'lobby:toilet'
+	$locM_arg = 'lobby:toilet'
 	$loc = 'brothel'
 	$location_type = 'bathroom'
 	minut += 2
@@ -156,7 +156,7 @@ if $ARGS[0] = 'bar:order':
 	*clr & cla
 	gs 'stat'
 	$loc = 'brothel'
-	$metka = 'bar'
+	$loc_arg = 'bar'
 	abdCh = rand (0, 100)
 	'<center><h3>Hotel Bar</h3></center>'
 	'<center><h5>Ordering a drink</h5></center>'
@@ -516,18 +516,18 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	menu_off = 0
 	gs 'stat'
 	$locM = 'brothel'
-	$metka = 'brothel:section1:girlroom'
+	$loc_arg = 'brothel:section1:girlroom'
 	$this = 'brothel:section1:girlroom'
-	$metkaM = 'brothel:section1:girlroom'
+	$locM_arg = 'brothel:section1:girlroom'
 	$location_type = 'bathroom'
-	$metka = 'brothel:section1:girlroom'
+	$loc_arg = 'brothel:section1:girlroom'
 	'<h3>Girl room</h3>'
 	 '<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelroom.jpg"></center>'
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $metka">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $metka">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $metka">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
+	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $loc_arg">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $loc_arg">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $loc_arg">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $loc_arg">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $loc_arg">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $loc_arg">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
 	'-------------------------------------------------------------------------------------'

locations/brother.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 		'Your brother is practically one of your closest friends.'
 	end
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 
 	*nl
 	if hour >= 7 and hour < 23:
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 					'Your brother points at your crotch, "Eww, there''s... <i>something</i> on your pussy. You should go wash that off."'
 				if brotherSex = 0:
 					npc_rel['A34'] -= 1
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 					exit
 				end
 			elseif $pantyworntype = 'none' and cumloc[4] = 1:
@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 					'Kolka calls out to you, "You''ve got... <i>something</i> on your butt, go wash yourself."'
 				if brotherSex = 0:
 					npc_rel['A34'] -= 1
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 					exit
 				end
 			else
@@ -102,7 +102,7 @@ if $ARGS[0] = 'start':
 					'Kolka recoils at your appearance, "Gross! You''ve got cum all over yourself, you whore!"'
 				if brotherSex = 0:
 					npc_rel['A34'] -= 1
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 					exit
 				end
 			end
@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 			end
 			if brotherSex = 0:
 				npc_rel['A34'] -= 1
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 				exit
 			end
 		end
@@ -153,7 +153,7 @@ if $ARGS[0] = 'start':
 		if npc_rel['A34'] < 20:
 			'Your brother groans in frustration, "Ugh, go away, <<$pcs_nickname>>! Go bother someone else!"'
 
-			act 'Leave':gt $loc, $metka
+			act 'Leave':gt $loc, $loc_arg
 			exit
 		else
 			if evgenQW >= 4 and pav_slut >= 150 and kolkaseepornday ! daystart:
@@ -186,7 +186,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
+	if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
 		if hour >= 7 and hour < 23:
 			act'Chat with Kolka':gt 'brother2', 'chat'
 			!!act'Banter with Kolka':gt'brother2','banter'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'playfootball':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football<<picrand>>.jpg"></center>'
 		end
 		'You spend an hour sitting on the bench, watching the guys play football.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	else
 		*clr & cla
 		minut += 60
@@ -410,11 +410,11 @@ if $ARGS[0] = 'playfootball':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	end
 	if rand(0, 1) = 0 and seepornofut = 0:
 		'The three boys gather together and begin whispering between themselves while giving you conspiratorial looks.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 		act 'Ask what they''re talking about':
 			*clr & cla
 			gs 'stat'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'playfootball':
 			gs 'willpower', 'misc', 'force'
 			if npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
 				'Kolka hesitates for a moment before giving you a funny look, "Actually, <<$pcs_nickname>>, we want to go watch some porn but we weren''t sure with having you around... But I think a girl like you could handle it."'
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 				act 'Show interest':
 					*clr & cla
 					gs 'stat'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'playfootball':
 					'"Porn!" Zhendos blurts out, causing your brother and his friend to stop arguing and fall silent. "We wanted to go watch some porn but you’re here."'
 					'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
 					'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 					if will_cost <= pcs_willpwr:
 						act 'Prove them wrong (<<will_cost>> Willpower)':
 							*clr & cla
@@ -461,7 +461,7 @@ if $ARGS[0] = 'playfootball':
 					end
 				end
 			else
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 		end
 	end
@@ -469,7 +469,7 @@ if $ARGS[0] = 'playfootball':
 	if seepornofut >= 1 and kolkaseepornday ! daystart:
 		'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
 
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 		act 'Go watch porn':minut += 5 & gt 'seeporn'
 	end
 end
@@ -652,7 +652,7 @@ if $ARGS[0] = 'sleepsexcum':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'showbody':
@@ -675,7 +675,7 @@ if $ARGS[0] = 'showbody':
 				gs 'willpower', 'pay', 'resist'
 				'Incredulously, you ask, "How the fuck can I do that? Should I just take off my clothes in front of you and let you gawk at me? I''m your sister!"'
 				'Kolka backs down in embarrassment, "You''re right, I''m sorry. I shouldn''t have asked."'
-				act 'Finish':gt $loc, $metka
+				act 'Finish':gt $loc, $loc_arg
 			end
 		else
   			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'showbody':
 			'After his promise you consider what to do.'
 
 			act'Get undressed':gt'brother','brother_voyeur_ev4'
-			act'Don''t do it':gt $loc, $metka
+			act'Don''t do it':gt $loc, $loc_arg
 		end
 	elseif npc_QW['A34'] > 3:
 		act'Undress again':gt'brother','brother_voyeur_ev4'
@@ -701,14 +701,14 @@ if $ARGS[0] = 'showbody':
 		if will_cost <= pcs_willpwr:
 			act 'Enough for today (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
-				gt $loc, $metka
+				gt $loc, $loc_arg
 			end
 		else
 			act 'Enough for today (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		exit
 	else
-		act 'Finish':gt $loc, $metka
+		act 'Finish':gt $loc, $loc_arg
 	end
 end
 
@@ -878,7 +878,7 @@ if $ARGS[0] = 'brotherSexEnd':
 			!!minut -= 15
 			!!gs 'stat'
 			!!'Kolka gives you an appreciative nod, "Nice one, <<$pcs_nickname>>, you''re well trained. Now, don''t tell anyone!"'
-			!!act 'Continue':gt $loc, $metka
+			!!act 'Continue':gt $loc, $loc_arg
 		!!end
 	!!else
 	if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
@@ -894,7 +894,7 @@ if $ARGS[0] = 'brotherSexEnd':
 		minut -= 15
 		gs 'stat'
 		'Kolka lets out a very satisfied sigh, "Ah, thanks so much for that, <<$pcs_nickname>>. I gotta go." He puts his drained cock back into his pants and leaves.'
-		act 'Continue':gt $loc, $metka
+		act 'Continue':gt $loc, $loc_arg
 	end
 	!!end
 end
@@ -928,7 +928,7 @@ if $ARGS[0] = 'brother_go_away':
 	'You cover your pussy with your hands and yell at your brother, "Kolka!? What the <i>fuck</i>? Get the fuck out of here, you small fry!"'
 	'Caught red-handed, Kolka slams the door and runs away. You finish showering quietly and dry yourself off.'
 
-	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
+	act 'Exit the shower':mirror_steam = hour & gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'brother_go_away2':
@@ -943,7 +943,7 @@ if $ARGS[0] = 'brother_go_away2':
 	'Caught red-handed, Kolka backs away slowly and the door clicks shut.'
 	'<i>Ugh, boys...</i> you think to yourself, rolling your eyes in annoyance. You finish showering and dry yourself off.'
 
-	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
+	act 'Exit the shower':mirror_steam = hour & gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'brother_voyeur_end':
@@ -966,7 +966,7 @@ if $ARGS[0] = 'brother_voyeur_end':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
+	act 'Exit the shower':mirror_steam = hour & gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'brother_voyeur_ev1':
@@ -1100,7 +1100,7 @@ if $ARGS[0] = 'brother_sex_end':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
+	act 'Exit the shower':mirror_steam = hour & gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'brother_voyeur_ev4':
@@ -1257,7 +1257,7 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 
 		gs 'willpower', 'exhib', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $loc_arg
 		else
 			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1269,7 +1269,7 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 
 		gs 'willpower', 'exhib', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $loc_arg
 		else
 			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1295,7 +1295,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 		'You put your hand up, "That''s enough!" You move towards your clothes on the floor.'
 		'"Wait, <<$pcs_nickname>>!" he cries.'
 		'"I said enough!" you say in a harsh tone and begin to dress.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	elseif npc_QW['A34'] > 4:
 		'You turn and sit down in the chair then spread your legs wide. Using the tips of your fingers, you gently pull at your labia, revealing your <<$vaginatipe2>> pussy to Kolka.'
 		'Your sibling is mesmerized, "Wow!"'
@@ -1312,7 +1312,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				'You spit out, "No, of course not!"'
 				'"Why?" he asks in bewilderment.'
 				'You immediately get up and move towards your clothing, "No fucking way, you are my brother!"'
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 			act'Insert a finger into your pussy':
 				cla
@@ -1350,7 +1350,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 
 			gs 'willpower', 'exhib', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+				act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $loc_arg
 			else
 				act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1413,7 +1413,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act'Get dressed':gt $loc, $metka
+			act'Get dressed':gt $loc, $loc_arg
 		end
 	elseif brotherSex >= 4:
 		*clr & cla
@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act'Get dressed':gt $loc, $metka
+			act'Get dressed':gt $loc, $loc_arg
 		end
 	elseif brotherConfidence > 10 and brotherSex < 4:
 		*clr & cla
@@ -1486,7 +1486,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act'Get dressed':gt $loc, $metka
+			act'Get dressed':gt $loc, $loc_arg
 		end
 	end
 end

locations/brother2.qsrc

@@ -307,7 +307,7 @@ if $ARGS[0] = 'wakeup':
 	act'Leave him alone':
 		cla
 		'You shrug, realizing that you''re not going to find a way to wake him up any time soon without him being mad at you and decide to leave him be.'
-		act'Move away':gt $loc, $metka
+		act'Move away':gt $loc, $loc_arg
 	end
 	
 	act'Yank his blanket off':
@@ -341,7 +341,7 @@ if $ARGS[0] = 'wakeup':
 			'"I hate you."'
 			'"Oh stop being so melodramatic," you say, rolling your eyes and tossing his blanket into the corner. "Now get ready for school before <<$npc_nickname[''A29'']>> yells at you."'
 		end
-		act'Move away':gt $loc, $metka
+		act'Move away':gt $loc, $loc_arg
 	end
 		
 	if brotherSex >= 2 or pcs_inhib >= 35 or npc_rel['A34'] >= 75:
@@ -392,7 +392,7 @@ if $ARGS[0] = 'wakeup':
 						'"More motivation for you to wake up," you smile. You cover yourself up, putting your clothes back in place. "Bet it''s difficult to go back to sleep with an erection that hard. Now go get dressed."'
 					end
 					'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
-					act'Move away':gt $loc, $metka
+					act'Move away':gt $loc, $loc_arg
 				end
 			
 				act'Trick him and don''t do it':
@@ -426,7 +426,7 @@ if $ARGS[0] = 'wakeup':
 				'"Alright!" he says cheerfully, waddling away with his pants around his ankles to find some tissues to clean himself up.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act'Move away':gt $loc, $metka
+				act'Move away':gt $loc, $loc_arg
 			end
 		end
 	end
@@ -458,7 +458,7 @@ if $ARGS[0] = 'wakeup':
 				'"Okay, okay," he says, getting up and tidying up the couch from where he was sleeping.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act'Move away':gt $loc, $metka
+				act'Move away':gt $loc, $loc_arg
 			end
 		end
 	end
@@ -516,7 +516,7 @@ if $ARGS[0] = 'show':
 		'"Good." You cover yourself up, putting your clothes back in place. "Now go get dressed."'
 	end
 	'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
-	act'Move away':gt $loc, $metka
+	act'Move away':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'trick':
@@ -540,7 +540,7 @@ if $ARGS[0] = 'trick':
 	'"Listen here you little-!"'
 	'<b><i>"Hey!"</i></b> your mother shouts from the bedroom. "What is all this racket going on so early in the morning?! You two get along or so help me I will spank you! I don''t care how old you are!"'
 	'Glaring silently at one another, the two of you retreat after a ceasefire being called by your mother. This probably wasn''t good for your relationship though...'
-	act'Move away':gt $loc, $metka
+	act'Move away':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'morninghj':
@@ -560,7 +560,7 @@ if $ARGS[0] = 'morninghj':
 	'"I''ll think about it," you say, rolling your eyes in amusement as you walk away, your brother automatically beginning to get ready for school.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act'Move away':gt $loc, $metka
+	act'Move away':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'morningbj':
@@ -587,7 +587,7 @@ if $ARGS[0] = 'morningbj':
 	'Having been given sufficient positive reinforcement, he obediently gets up and starts going about tidying the sofa and getting ready to go to school.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act'Move away':gt $loc, $metka
+	act'Move away':gt $loc, $loc_arg
 end
 --- brother2 ---------------------------------
 

locations/brother_lessons.qsrc

@@ -215,7 +215,7 @@ if $ARGS[0] = 'showbody':
 				cla
 				'"How the fuck can I do that? Should I just take my clothes off in front of you and let you gawk at me? I''m your sister!"'
 				'"Yes, you are right. I''m sorry..." Kolka responded in embarrassment.'
-				act 'Finish':gt $loc, $metka
+				act 'Finish':gt $loc, $loc_arg
 			end
 
 			act'"Huh..."':
@@ -229,7 +229,7 @@ if $ARGS[0] = 'showbody':
 				'After his promise you consider what to do.'
 
 				act'Undress':gt'brother','brother_voyeur_ev4'
-				act'Don''t do it':gt $loc, $metka
+				act'Don''t do it':gt $loc, $loc_arg
 			end
 
 			act'"What do you mean?"':
@@ -242,7 +242,7 @@ if $ARGS[0] = 'showbody':
 					*nl
 					'It finally dawns on you what he''s asking and you pull back in disgust. "What the hell?! No way! I''m not about to let you use me as a science project! Ugh! Get a grip Kolka!"'
 					'"I''m sorry <<$pcs_firstname>>..." he whimpers. "I shouldn''t have asked..."'
-					act 'Finish':gt $loc, $metka
+					act 'Finish':gt $loc, $loc_arg
 				end
 
 				act'Well, nothing beats practical learning':
@@ -265,7 +265,7 @@ if $ARGS[0] = 'showbody':
 				*nl
 				'"Of course I am Kolka, just not right now," you say. "I''m a little busy at the moment, but if you ask me again later, maybe some other day, okay?"'
 				'"Okay!" he nods, taking it as a promise.'
-				act 'Finish':gt $loc, $metka
+				act 'Finish':gt $loc, $loc_arg
 			end
 
 			act'"Of course!"':
@@ -280,7 +280,7 @@ if $ARGS[0] = 'showbody':
 					'<center><b><font color = maroon>Kolka</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/homework1.jpg"></center>'
 					'You do your best to go through the text with your brother and explain it to him but he''s still really struggling with it. Even you have to admit, those pictures and diagrams really aren''t very good.'
-					act'Finish':gt $loc, $metka
+					act'Finish':gt $loc, $loc_arg
 				end
 
 				act'Use your body as an example and explain it that way':
@@ -298,7 +298,7 @@ if $ARGS[0] = 'showbody':
 			*nl
 			'"I''m sorry Kolka," you say. "I''m a little busy at the moment, maybe next time okay?"'
 			'"Okay!" he nods, packing up the rest of his schoolwork.'
-			act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $loc_arg
 		end
 
 		act'"Sure!"':
@@ -316,7 +316,7 @@ if $ARGS[0] = 'showbody':
 			'After his promise you consider what to do.'
 
 			act'Undress':gt'brother','brother_voyeur_ev4'
-			act'Don''t do it':gt $loc, $metka
+			act'Don''t do it':gt $loc, $loc_arg
 		end
 	end
 end
@@ -367,7 +367,7 @@ if $ARGS[0] = 'anatomylesson1':
 						gs 'underwear', 'wear'
 						gs 'stat'
 						gs 'clothing', 'wear_last_worn'
-						gt $loc, $metka
+						gt $loc, $loc_arg
 					end
 				end
 			end
@@ -744,7 +744,7 @@ if $ARGS[0] = 'anatomylesson4':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear_last_worn'
 			gs 'stat'
-			gt $loc, $metka
+			gt $loc, $loc_arg
 		end
 	end
 
@@ -793,7 +793,7 @@ if $ARGS[0] = 'anatomylesson4':
 							gs 'underwear', 'wear'
 							gs 'clothing', 'wear_last_worn'
 							gs 'stat'
-							gt $loc, $metka
+							gt $loc, $loc_arg
 						end
 					end
 				end

locations/budgetclothes.qsrc

@@ -1,7 +1,7 @@
 # budgetclothes
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'start'
@@ -91,7 +91,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'clothes':
-	$metka = 'clothes'
+	$loc_arg = 'clothes'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'clothes'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'office':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'office'
 	menu_off = 0
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
@@ -213,7 +213,7 @@ if $ARGS[0] = 'uniform':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'uniform'
 	menu_off = 0
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'school'
 	menu_off = 0
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'schoolclo':
 end
 
 if $ARGS[0] = 'shoes':
-	$metka = 'shoes'
+	$loc_arg = 'shoes'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'shoes'
@@ -355,7 +355,7 @@ end
 if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gandm',i, 700
 
 if $ARGS[0] = 'trainers':
-	$metka = 'trainers'
+	$loc_arg = 'trainers'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'trainers'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'coats':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'coats'
 	menu_off = 0
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'purses':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'purses'
 	menu_off = 0
-	$metka = 'purses'
+	$loc_arg = 'purses'
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
@@ -445,7 +445,7 @@ end
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'cheap',i, 1500
 
 if $ARGS[0] = 'panties':
-	$metka = 'panties'
+	$loc_arg = 'panties'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'panties'
@@ -474,7 +474,7 @@ if $ARGS[0] = 'bras':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'bras'
 	menu_off = 0
-	$metka = 'bras'
+	$loc_arg = 'bras'
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'

locations/budilnik.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'Reset':
 	gt 'budilnik', 'start'
 end
 
-if $ARGS[0] = 'fin': gt $loc, $metka
+if $ARGS[0] = 'fin': gt $loc, $loc_arg
 
 --- budilnik ---------------------------------
 

locations/buklinik_event.qsrc

@@ -191,8 +191,8 @@ end
 ! --- LOCATIONS --- !
 if $ARGS[0] = 'hall':
 	cls
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'buklinik_event'
     $location_type = 'public_indoors'
 	killvar '$locclass'
 	minut += 5
@@ -210,8 +210,8 @@ end
 
 if $ARGS[0] = 'room':
 	cls
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'buklinik_event'
 	minut += 5
 	gs 'stat'
 	'<center><b><font color = maroon>Bathroom Michael</font></b></center>'
@@ -227,7 +227,7 @@ if $ARGS[0] = 'room':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/uborka.jpg"></center>'
 			'You cleaned the apartment.'
-			act 'Finish cleaning': gt $loc, $metka
+			act 'Finish cleaning': gt $loc, $loc_arg
 		end
 	end
 	'<a href="exec:gt ''buklinik_event'',''misha''">Michael</a> lying in bed and reading a book.'
@@ -237,7 +237,7 @@ end
 
 if $ARGS[0] = 'kitchen':
 	cls
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$loc = 'buklinik_event'
 	$locclass = 'kitr'
 	minut += 5
@@ -253,7 +253,7 @@ if $ARGS[0] = 'kitchen':
 			nanny_food = 1
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/gotovka.jpg"></center>'
 			'You cooked the food and fed Michael.'
-			act 'Finish': gt $loc, $metka
+			act 'Finish': gt $loc, $loc_arg
 		end
 	end
 	act 'Out': gt 'buklinik_event', 'hall'

locations/burger.qsrc

@@ -1,7 +1,7 @@
 # burger
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'burger'
 	$menu_loc = 'burger'
 	$menu_arg = 'start'

locations/burlesque.qsrc

@@ -1,7 +1,7 @@
 # burlesque
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'burlesque'
 	$menu_loc = 'burlesque'
 	$menu_arg = 'start'

locations/butoilet.qsrc

@@ -1,10 +1,10 @@
 # butoilet
 CLOSE ALL
 
-$metka = $ARGS[0]
-$loc = $CURLOC
-$metkaM = $ARGS[0]
-$locM = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'butoilet'
+$locM_arg = $ARGS[0]
+$locM = 'butoilet'
 $location_type = 'bathroom'
 $locclass = 'restroom'
 $menu_loc = 'butoilet'

locations/cafe_parco.qsrc

@@ -18,7 +18,7 @@ if $args[0]= 'inner':
 	$menu_loc = 'cafe_parco'
 	$menu_arg = 'inner'
 	menu_off = 0
-	$metka = 'inner'
+	$loc_arg = 'inner'
 	$loc = 'cafe_parco'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 

locations/carF.qsrc

@@ -29,8 +29,8 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'carF'
 	$menu_arg = 'start'
 	menu_off = 0
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF'
 	CLOSE ALL
 	*clr & cla
 	minut += 1
@@ -62,8 +62,8 @@ end
 
 if $ARGS[0] = 'salon':
 	menu_off = 1
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF'
 	*clr & cla
 	minut += 1
 	gs 'stat'

locations/carF1.qsrc

@@ -3,8 +3,8 @@
 menu_off = 1
 
 if $ARGS[0] = 'car':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -27,8 +27,8 @@ if $ARGS[0] = 'car':
 end
 
 if $ARGS[0] = 'car2':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -51,8 +51,8 @@ if $ARGS[0] = 'car2':
 end
 
 if $ARGS[0] = 'car3':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -75,8 +75,8 @@ if $ARGS[0] = 'car3':
 end
 
 if $ARGS[0] = 'car4':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -99,8 +99,8 @@ if $ARGS[0] = 'car4':
 end
 
 if $ARGS[0] = 'car5':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -123,8 +123,8 @@ if $ARGS[0] = 'car5':
 end
 
 if $ARGS[0] = 'car6':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -148,8 +148,8 @@ if $ARGS[0] = 'car6':
 end
 
 if $ARGS[0] = 'car7':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -172,8 +172,8 @@ if $ARGS[0] = 'car7':
 end
 
 if $ARGS[0] = 'car8':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -196,8 +196,8 @@ if $ARGS[0] = 'car8':
 end
 
 if $ARGS[0] = 'car9':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -220,8 +220,8 @@ if $ARGS[0] = 'car9':
 end
 
 if $ARGS[0] = 'car10':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -244,8 +244,8 @@ if $ARGS[0] = 'car10':
 end
 
 if $ARGS[0] = 'car13':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -268,8 +268,8 @@ if $ARGS[0] = 'car13':
 end
 
 if $ARGS[0] = 'car95':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -292,8 +292,8 @@ if $ARGS[0] = 'car95':
 end
 
 if $ARGS[0] = 'car96':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -318,8 +318,8 @@ if $ARGS[0] = 'car96':
 end
 
 if $ARGS[0] = 'car97':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -342,8 +342,8 @@ if $ARGS[0] = 'car97':
 end
 
 if $ARGS[0] = 'car98':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -366,8 +366,8 @@ if $ARGS[0] = 'car98':
 end
 
 if $ARGS[0] = 'car99':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -390,8 +390,8 @@ if $ARGS[0] = 'car99':
 end
 
 if $ARGS[0] = 'car100':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -414,8 +414,8 @@ if $ARGS[0] = 'car100':
 end
 
 if $ARGS[0] = 'car101':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -438,8 +438,8 @@ if $ARGS[0] = 'car101':
 end
 
 if $ARGS[0] = 'car102':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -462,8 +462,8 @@ if $ARGS[0] = 'car102':
 end
 
 if $ARGS[0] = 'car103':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -486,8 +486,8 @@ if $ARGS[0] = 'car103':
 end
 
 if $ARGS[0] = 'car104':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -510,8 +510,8 @@ if $ARGS[0] = 'car104':
 end
 
 if $ARGS[0] = 'car105':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -534,8 +534,8 @@ if $ARGS[0] = 'car105':
 end
 
 if $ARGS[0] = 'car106':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -558,8 +558,8 @@ if $ARGS[0] = 'car106':
 end
 
 if $ARGS[0] = 'car107':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -582,8 +582,8 @@ if $ARGS[0] = 'car107':
 end
 
 if $ARGS[0] = 'car108':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -606,8 +606,8 @@ if $ARGS[0] = 'car108':
 end
 
 if $ARGS[0] = 'car109':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -630,8 +630,8 @@ if $ARGS[0] = 'car109':
 end
 
 if $ARGS[0] = 'car110':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -654,8 +654,8 @@ if $ARGS[0] = 'car110':
 end
 
 if $ARGS[0] = 'car111':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla	
 	minut += 5
 	gs'stat'
@@ -678,8 +678,8 @@ if $ARGS[0] = 'car111':
 end
 
 if $ARGS[0] = 'car112':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'carF1'
 	*clr & cla
 	minut += 5
 	gs'stat'

locations/casino.qsrc

@@ -4,7 +4,7 @@ $loc = 'casino'
 $menu_loc = 'casino'
 
 if $ARGS[0] = 'outside':
-	$metka = 'outside'
+	$loc_arg = 'outside'
 	$menu_arg = 'outside'
 	menu_off = 0
 
@@ -24,7 +24,7 @@ end
 
 if $ARGS[0] = 'foyer':
 	CLOSE ALL
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -50,7 +50,7 @@ end
 !!----------
 
 if $ARGS[0] = 'roulette':
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 
@@ -373,7 +373,7 @@ end
 !!-------
 
 if $ARGS[0] = 'slots':
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	
@@ -447,7 +447,7 @@ end
 !!-------
 
 if $ARGS[0] = 'cards':
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	*clr & cla
@@ -510,7 +510,7 @@ end
 !!--------------------
 
 if $ARGS[0] = 'cards_cw':
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	

locations/changingroom.qsrc

@@ -31,13 +31,13 @@ if $ARGS[0] = 'view_swim_list':
 		'<center>It''s below 15C - far too cold to get changed into swimwear. You should wait until the weather warms up.</center>'
 	end
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 	
 	if $clothingworntype = 'swimwear':
 		act 'Put your regular clothes back on':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt $loc, $metka
+			gt $loc, $loc_arg
 		end
 	end
 end
@@ -74,7 +74,7 @@ if $ARGS[0] = 'view_swim_item':
 		act 'Wear':
 			gs 'underwear', 'remove'
 			gs 'clothing', 'wear', $ARGS[1], ARGS[2]
-			gt $loc, $metka
+			gt $loc, $loc_arg
 		end
 	end
 end

locations/city_center.qsrc

@@ -1,6 +1,6 @@
 # city_center
 
-$metka = $ARGS[0]
+$loc_arg = $ARGS[0]
 $loc = 'city_center'
 $menu_loc = 'city_center'
 $menu_arg = ''

locations/city_clinic.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	CLOSE all
 	$sexloc = 'city_clinic'
 	$loc = 'city_clinic'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$location_type = 'indoors'
 	$menu_loc = 'city_clinic'
 	$menu_arg = 'start'

locations/city_dima.qsrc

@@ -1,7 +1,7 @@
 # city_dima
 
 $loc = 'city_dima'
-$metka = 'start'
+$loc_arg = 'start'
 $menu_loc = 'city_dima'
 $menu_arg = ''
 menu_off = 0

locations/city_industrial.qsrc

@@ -1,10 +1,8 @@
 # city_industrial
 
 if $ARGS[0] = '':
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'city_industrial'
-	$metkaStreet = ''
-	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'city_industrial'
 	$menu_arg = ''
@@ -55,7 +53,7 @@ if $ARGS[0] = '':
 	'The towns <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is an hours walk from here.'
 
 	if hour > 7 and hour < 23:
-		'You can see the <a href="exec:$locM = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+		'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.'
 	end
@@ -124,10 +122,8 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'redlight':
-	$metka = 'redlight'
+	$loc_arg = 'redlight'
 	$loc = 'city_industrial'
-	$metkaStreet = 'redlight'
-	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'city_industrial'
 	$menu_arg = 'redlight'

locations/city_industrial_train.qsrc

@@ -1,7 +1,7 @@
 # city_industrial_train
 
 if $ARGS[0] = 'inside':
-	$metka = 'inside'
+	$loc_arg = 'inside'
 	$loc = 'city_industrial_train'
 	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
@@ -26,7 +26,7 @@ if $ARGS[0] = 'inside':
 end
 
 if $ARGS[0] = 'outside':
-	$metka = 'outside'
+	$loc_arg = 'outside'
 	$loc = 'city_industrial_train'
 	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'outside'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'outside':
 end
 
 if $ARGS[0] = 'platform':
-	$metka = 'platform'
+	$loc_arg = 'platform'
 	$loc = 'city_industrial_train'
 	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
@@ -78,9 +78,9 @@ if $ARGS[0] = 'platform':
 end
 
 if $ARGS[0] = 'toilet':
-	$metkaM = 'toilet'
+	$locM_arg = 'toilet'
 	$locM = 'city_industrial_train'
-	$metka = 'toilet'
+	$loc_arg = 'toilet'
 	$loc = 'city_industrial_train'
 	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
@@ -180,7 +180,7 @@ end
 
 if $ARGS[0] = 'centre':
 	$loc = 'city_train'
-	$metka = 'inside'
+	$loc_arg = 'inside'
 	menu_off = 1
 	*clr & cla
 	minut += 5
@@ -197,7 +197,7 @@ end
 
 if $ARGS[0] = 'communal':
 	$loc = 'train'
-	$metka = 'communal'
+	$loc_arg = 'communal'
 	menu_off = 1
 	minut += 10
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -212,7 +212,7 @@ end
 
 if $ARGS[0] = 'village':
 	$loc = 'train'
-	$metka = 'village'
+	$loc_arg = 'village'
 	menu_off = 1
 	minut += 20
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -228,7 +228,7 @@ end
 
 if $ARGS[0] = 'pavlovsk':
 	$loc = 'pav_train_hall'
-	$metka = 'platform'
+	$loc_arg = 'platform'
 	menu_off = 1
 	minut += 35
 	if rand(1, 100) < 15: gt 'train', 'private'

locations/city_island.qsrc

@@ -1,6 +1,6 @@
 # city_island
 
-$metka = ''
+$loc_arg = ''
 $loc = 'city_island'
 $location_type = 'public_outdoors'
 $menu_loc = 'city_island'
@@ -47,7 +47,7 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+if hour >= 8 and hour <= 22:'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> is a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
 if hour >= 4 and hour <= 23:'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'

locations/city_kafe.qsrc

@@ -1,7 +1,7 @@
 # city_kafe
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'city_kafe'
 	$menu_loc = 'city_kafe'
 	$menu_arg = 'start'
@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'table':
-	$metka = 'table'
+	$loc_arg = 'table'
 	$loc = 'city_kafe'
 	$menu_loc = 'city_kafe'
 	$menu_arg = 'table'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'workPred':
 	$menu_loc = 'city_kafe'
 	$menu_arg = 'workPred'
 	menu_off = 0
-	$metka = 'workPred'
+	$loc_arg = 'workPred'
 	$loc = 'city_kafe'
 	$location_type = 'event'
 	killvar '$locclass'

locations/city_kafe2.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'toilet':
 	$location_type = 'bathroom'
 	$locclass = 'restroom'
 	$locM = 'city_kafe2'
-	$metkaM = 'toilet'
+	$locM_arg = 'toilet'
 	$menu_loc = 'city_kafe2'
 	$menu_arg = 'toilet'
 	menu_off = 0
@@ -181,7 +181,7 @@ end
 
 if $ARGS[0] = 'ashot':
 	$loc = 'city_kafe2'
-	$metka = 'ashot'
+	$loc_arg = 'ashot'
 	$locclass = 'kitr'
 	cls
 	gs 'stat'