[Changed] some variable migration also moved some reoccuring code into one location also added some killvars for temp variables

.gitignore

@@ -45,3 +45,4 @@ glife.7z.tmp
 glife.7z
 
 *.test
+missing_media.txt

locations/BurgerTip.qsrc

@@ -44,6 +44,7 @@ if $ARGS[0] = 'work':
 			bossrand = rand(0, 3)
 
 			if bossrand = 0:
+				killvar'bossrand'
 				'When you enter Anatoly''s office he glances up and says, "<<$pcs_nickname>>, bring me a cup of coffee."'
 				
 				act 'Fetch him a coffee':
@@ -59,6 +60,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bossrand = 1:
+				killvar'bossrand'
 				'When you enter his office, Anatoly tells you: "<<$pcs_nickname>>, I need these documents sighed by the accountant. Take them to her, and see that she signs them. When he does, return them to me."'
 
 				act 'Go to the chief accountant':
@@ -81,6 +83,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bossrand = 2:
+				killvar'bossrand'
 				'"<<$pcs_nickname>>, I need Ilyushkin working on these documents in a hurry", Anatoly says. You grab the papers, and scamper out of the office'
 
 				act 'Take the papers to Ilyushkin':
@@ -105,6 +108,7 @@ if $ARGS[0] = 'work':
 				end
 			elseif bossrand = 3:
 				*clr&cla
+				killvar'bossrand'
 				bossexrand = rand(0, 3)
 				pcs_horny += 10
 				gs 'stat'
@@ -115,6 +119,7 @@ if $ARGS[0] = 'work':
 				if bossexrand = 1:'His hand slides down your stomach, and crawls under your skirt. You moan softly when his hand begins to caress your pussy.'
 				if bossexrand = 2:'He grabs your ass, and lifting up your skirt begins to knead your ass like dough.'
 				if bossexrand = 3:'He puts his hands on your hips, and slowly raises your skirt.'
+				killvar'bossexrand' 
 				gs 'boyStat', 'A74'
 
 				act 'Kiss him':
@@ -145,6 +150,7 @@ if $ARGS[0] = 'work':
 							if bosstipsexrand >= 3:
 								act 'Moan': gt 'BurgerTip', 'sex2'
 							elseif bosstipsexrand < 3:
+								killvar'bosstipsexrand'
 								'His hand goes further finding your sphincter with one of his fingers. The probing of his finger leaves no doubt about what he wants.'
 								
 								gs 'arousal', 'anal_finger', 5, 'sub'
@@ -189,12 +195,14 @@ if $ARGS[0] = 'work':
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
+				killvar'bosstiprand'
 				BurgerQW['TerminalTask'] = 1
 				BurgerQW['TerminalTaskDay'] = daystart
 				'Anatoly comes out of the office, and asks, "<<$pcs_nickname>>, I know it''s lunch time, but I really need these documents taken to the storage terminal in the city industrial area to be signed. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
 				act 'Deliver the papers':gt 'city_center'
 			elseif bosstiprand = 1:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says: "<<$pcs_nickname>>, before lunch I need you to head down to the loading dock, and sign for a shipment of food that''s due to arrive. There''s a gold star in it for you if take care of this for me."'
 
 				act 'Go sign for the shipment':
@@ -210,6 +218,7 @@ if $ARGS[0] = 'work':
 				end
 
 			elseif bosstiprand = 2:
+				killvar'bosstiprand'
 				BurgerQW['BankTask'] = 1
 				BurgerQW['BankTaskDay'] = daystart
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, please run these documents to the bank for me. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
@@ -243,10 +252,12 @@ if $ARGS[0] = 'work':
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office and says, "<<$pcs_nickname>>, I have to leave early today. Here''s a few papers for you to file,"  He hands you a folder on his way out of the office.'
 				bburand = rand(0, 10)
 
 				if bburand = 0:
+					killvar'bburand'
 					'The senior manager Ilyushkin shows up in your office.'
 					
 					if $BurgerQW['IlyQWBlackmailPhoto'] = '' or BurgerQW['IlyQWBlackmail'] > 1:
@@ -265,7 +276,7 @@ if $ARGS[0] = 'work':
 					'The assistant manager Sergei shows up in your office.'
 					'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 					'"No, he just he just left." you tell him.'
-
+					killvar'bburand'
 					if BurgerQW['sergeyQW'] = 1:
 						'The pimply young man chuckles, and sits on the edge of your desk. "<<$pcs_nickname>>, you''re dynamite. We are very lucky to have a girl like you around," he says, leering at you.'
 					elseif BurgerQW['sergeyQW'] = 0:
@@ -327,7 +338,7 @@ if $ARGS[0] = 'work':
 					'Lena comes up to your desk and asks, "Is the boss around?"'
 					'"No, he stepped out," you reply.'
 					'She purses her lips looking at you with disapproval, before she turns to go.'
-					
+					killvar'bburand'
 					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
 					elseif BurgerQW['WorkShift'] = 2:
@@ -335,7 +346,7 @@ if $ARGS[0] = 'work':
 					end
 				elseif bburand = 3:
 					'The personnel manager Vick comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
-
+					killvar'bburand'
 					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
 					elseif BurgerQW['WorkShift'] = 2:
@@ -351,6 +362,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bosstiprand = 1:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office and says, "<<$pcs_nickname>>, let''s get out of here and go have some fun."'
 
 				act 'Go with Anatoly':
@@ -361,12 +373,13 @@ if $ARGS[0] = 'work':
 
 					if BurMestoRand = 0:
 						'You get in the car with Anatoly, and soon arrive at the sauna in the residential area. Your boss gives you a wicked little grin and says, "I made reservations to get us a private room."'
-						
+						killvar'BurMestoRand'
 						act 'Go to the sauna':
 							*clr&cla
 							gs 'stat'
-
+							
 							if SaunaWhore > 0:
+								
 								BurgerQW['SaunaWhoreKnown'] = 1
 								'When you enter the sauna and stop dead in your tracks when you see the madam."<<$pcs_nickname>>, what a surprise are you coming back to work for us."' 
 								'Anatoly says, "Whats going on here?"'
@@ -440,6 +453,7 @@ if $ARGS[0] = 'work':
 							end
 						end
 					elseif BurMestoRand = 1:
+						killvar'BurMestoRand'
 						'You get in the car, but before you can go anywhere Anatoly''s phone rings. He frowns before answering, "Yes dear, i will soon." He hangs up and says to you, "I''ve got to get home. Could you do your boss a favor, before I have to head home to the old battle axe?"'
 
 						act 'You''re great at giving favors':
@@ -461,6 +475,7 @@ if $ARGS[0] = 'work':
 
 				exit
 			elseif bosstiprand = 2:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, call the that guy we had set up our computers. The on button of my PC seems to be broken."'
 
 				act 'Call the computer guy':
@@ -484,6 +499,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bosstiprand = 3:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, I need you to stay late today. I have some men coming in for a meeting, and I might need an extra set of hand around.'
 
 				act 'Sure thing boss':
@@ -500,6 +516,7 @@ if $ARGS[0] = 'work':
 		exit
 	elseif burand = 2:
 		*clr & cla
+		killvar'burand'
 		if $BurgerQW['IlyQWBlackmailPhoto'] ! '' and BurgerQW['IlyQWBlackmail'] = 0:
 			gt 'BurgerTip', 'ily_work'
 		elseif $BurgerQW['IlyQWBlackmailPhoto'] = '' and BurgerQW['IlyQWBlackmail'] > 1:
@@ -524,6 +541,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 3:
+		killvar'burand'
 		'The assistant manager Sergei shows up in your office.'
 		'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 		'"No, he just he just left." you tell him.'
@@ -536,6 +554,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 4:
+		killvar'burand'
 		'Lena comes up to your desk and asks, "Is the boss around?"'
 		'"No, he stepped out," you reply.'
 		'She purses her lips looking at you with disapproval, before she turns to go.'
@@ -548,6 +567,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 5:
+		killvar'burand'
 		'The personnel manager Vic comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
 
 		if BurgerQW['WorkShift'] = 1:
@@ -558,6 +578,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 6:
+		killvar'burand'
 		'An elegantly dressed woman shows up at the office.'
 
 		if BurgerQW['SlutReputation'] < 10:
@@ -581,6 +602,7 @@ if $ARGS[0] = 'work':
 				Pay = BurgerQW['SecretaryTimesWorked'] * 1250
 				BurgerQW['SecretaryTimesWorked'] = 0
 				money += Pay
+				killvar'Pay'
 				gs 'stat'
 				'You quickly write out something that effectively says "I quit!" with some fancy words thrown in.'
 				'Anatoly pays you the <<pay>> <b>₽</b> you are owed, and says, "It''s over <<$pcs_nickname>>, get out of here."'
@@ -630,6 +652,8 @@ if $ARGS[0] = 'bj':
 		act 'Finish him by hand': gt 'BurgerTip', 'bj_cum'
 		act 'Continue to suck': gt 'BurgerTip', 'bj2'
 	end
+	killvar'wantrand'
+	killvar'numbjrand'
 end
 
 if $ARGS[0] = 'toilet':
@@ -675,7 +699,8 @@ if $ARGS[0] = 'toilet':
 			gs 'cum_cleanup'
 
 			'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+			killvar'$deytoibur'
+			killvar'$deytoibur2'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
@@ -683,6 +708,8 @@ if $ARGS[0] = 'toilet':
 			end
 		end
 	end
+	killvar'bosstoirandin'
+	killvar'bosstoirand'
 end
 
 if $ARGS[0] = 'toilet_wash':
@@ -696,7 +723,8 @@ if $ARGS[0] = 'toilet_wash':
 	gs 'cum_cleanup'
 				
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+	killvar'$deytoibur'
+	killvar'$deytoibur2'
 	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
 	elseif BurgerQW['WorkShift'] = 2:
@@ -715,7 +743,8 @@ if $ARGS[0] = 'toilet_wash2':
 	gs 'cum_cleanup'
 
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+	killvar'$deytoibur'
+	killvar'$deytoibur2'
 	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
 	elseif BurgerQW['WorkShift'] = 2:
@@ -780,12 +809,14 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
+			killvar'boburand'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
+			killvar'boburand'
 			gs 'cum_call', 'clothes', 'A74', 1
 			gs 'stat'
 			'Afterword, you notice you got some of his semen on your blouse.'
@@ -806,12 +837,14 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
+			killvar'boburand'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
+			killvar'boburand'
 			gs 'cum_call', 'clothes', 'A74', 1
 			gs 'stat'
 			'You notice that you didn''t get it all. A few drops of semen are staining your blouse.'
@@ -839,7 +872,6 @@ end
 
 if $ARGS[0] = 'sex':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 1
 	gs 'stat'
@@ -854,6 +886,7 @@ if $ARGS[0] = 'sex':
 	gs 'stat'
 
 	if bosswantrand >= 3:
+		killvar'bosswantrand'
 		gs 'cum_call', 'butt', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
 		
@@ -866,6 +899,7 @@ if $ARGS[0] = 'sex':
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
+		killvar'bosswantrand'
 		'Without warning, Anatoly takes his cock from pussy, and pushes it against your sphincter.'
 		act 'Give it to him': gt 'BurgerTip', 'anal'
 	end
@@ -873,7 +907,6 @@ end
 
 if $ARGS[0] = 'anal':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 1
 	gs 'stat'
@@ -881,7 +914,6 @@ if $ARGS[0] = 'anal':
 	'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossanal.jpg"></center>'
 	'You push your hips back presenting your ass for Anatoly.'
 	gs 'arousal', 'auto_lube', 'anal'
-	!!gs 'dinsex','sexcum'
 	gs 'cum_call', 'butt', 'A74', 1
 	'He finishes by giving you a little smack on the ass and a "good girl".'
 	
@@ -898,7 +930,6 @@ end
 
 if $ARGS[0] = 'sex2':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 0
 	gs 'stat'
@@ -914,6 +945,7 @@ if $ARGS[0] = 'sex2':
 	gs 'stat'
 	
 	if bosswantrand >= 3:
+		killvar'bosswantrand'
 		gs 'cum_call', 'stomach', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
 		
@@ -926,6 +958,7 @@ if $ARGS[0] = 'sex2':
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
+		killvar'bosswantrand'
 		'Without warning, Anatoly takes his cock from pussy, and pushes it against your tight little ass.'
 		act 'Take it in the ass':gt 'BurgerTip', 'anal2'
 	end
@@ -934,7 +967,6 @@ end
 if $ARGS[0] = 'anal2':
 	act 'Take it in the ass':gt 'BurgerTip', 'anal2'
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 0
 	gs 'stat'

locations/Cheatmenu_din.qsrc

@@ -3476,10 +3476,10 @@ $cheatmenu['items'] = {
 		*pl 'Fabric: <a href="exec:mc_inventory[''sewing_fabric'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''sewing_fabric'']>> </b></a>'
 
 		if mc_inventory['sewing_kit'] = 0:
-			*pl 'Sewing kit: <a href="exec:sewing_kit = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			*pl 'Sewing kit: <a href="exec:mc_inventory[''sewing_kit''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if mc_inventory['sewing_kit'] = 1:
-			*pl 'Sewing kit: <a href="exec:sewing_kit = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			*pl 'Sewing kit: <a href="exec:mc_inventory[''sewing_kit''] = 1 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
 		if bag = 1:

locations/TerminalOffice.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = '11':
 		'You talk with the Manager about buying small trinkets...'
 		
 		!Get current balances
-		TovarRepository1 = tovarL
+		TovarRepository1 = mc_inventory['trinkets_home']
 		if TovarRepository1 => TovarLimitRepository1:
 			'There is no more free space at home.'
 		else
@@ -94,7 +94,7 @@ if $ARGS[0] = '11':
 		
 		if YouCanGar > 0:
 			!Get the current balances in the garage
-			TovarRepository2 = GarTorgItem
+			TovarRepository2 = mc_inventory['trinkets_garage']
 			if TovarRepository2 => TovarLimitRepository2:
 				'There is no space in the garage.'
 			else
@@ -139,18 +139,18 @@ if $ARGS[0] = '11':
 					
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
-						tovarL = TovarRepository1 + MaxQuantity1
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
 						MaxQuantityA -= MaxQuantity1
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantity1>> PCs. storage room, garage <<MaxQuantityA>> PCs.'
 					else
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantityA>> PCs. storage room, garage 0 PCs.'
-						tovarL = TovarRepository1 + MaxQuantityA
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
 					
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
-						GarTorgItem = TovarRepository2 + MaxQuantityA
+						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
 					
 					if YouCanGar = 0 and money > 100: 
@@ -191,18 +191,18 @@ if $ARGS[0] = '11':
 					
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
-						tovarL = TovarRepository1 + MaxQuantity1
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
 						MaxQuantityA -= MaxQuantity1
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantity1>> PCs. storage room, garage <<MaxQuantityA>> PCs.'
 					else
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantityA>> PCs. storage room, garage 0 PCs.'
-						tovarL = TovarRepository1 + MaxQuantityA
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
 					
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
-						GarTorgItem = TovarRepository2 + MaxQuantityA
+						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
 					
 					if YouCanGar = 0 and money > 100: 

locations/albina_starlets_sex.qsrc

@@ -581,6 +581,7 @@ if $ARGS[0] = 'whore5':
 		tipdarand = rand(0,1)
 
 		if tipdarand = 0:
+			killvar'tipdarand'
 			'The guys then effortlessly lift you to your feet and lead you over to the bed. You get on all fours and one guy kneels in front of you. You resume sucking his huge cock as the other moves in behind you and spits on your anus before sliding his finger inside you.'
 			'You moan softly as you keep sucking the cock in your mouth. The guy keeps fingering your ass before withdrawing and bringing his cock to your asshole.'
 			gs 'arousal', 'bj', 10, 'dick', 'sub', 'group'
@@ -618,6 +619,7 @@ if $ARGS[0] = 'whore5':
 				end
 			end
 		elseif tipdarand = 1:
+			killvar'tipdarand'
 			'The guys then effortlessy lift you up and lay you on the bed, your head leaning over the edge.'
 			'One of them climbs in beside you and spreads your legs as the other moves to the edge of the bed and presses his cock against your lips.'
 

locations/alexandriaChat.qsrc

@@ -771,6 +771,7 @@ if $ARGS[0] = 'sword':
 								moncheri_gown_h[numrand] = 50
 								moncheri_gown_b[numrand] = pcs_hips
 								'<center><img <<$set_imgh>> src="images/pc/items/moncheri/gown/<<numrand>>.jpg"></center>'
+								killvar 'numrand'
 							else
 								jump 'markbuycloalexandria'
 							end

locations/bedrPar.qsrc

@@ -219,13 +219,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					act 'Masturbate':gt 'selfplay', 'start'
 				end
 
-				if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-				if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+				if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+				 if mc_inventory['card'] > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 			end
 
 			gs 'events', 'read'
 
-			if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
+			if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
 			
@@ -236,50 +236,16 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if mc_inventory['sewing_kit'] = 1:
 				'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
 				*nl
-				if mc_inventory['sewing_fabric'] <= 0:
-					'You do not have any fabric.'
-				else
-					if pcs_sewng < 40:
-						'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-					elseif pcs_sewng < 80:
-						'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-					else
-						if newgobelen = 0:
-							act'Start a new tapestry':
-								*clr & cla
-								menu_off = 1
-								mc_inventory['sewing_fabric'] -= 1
-								newgobelen = 1
-								minut += 15
-								gs 'stat'
-								'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-
-								act 'Set the tapestry aside': gt 'bedrPar', 'start'
-							end
-						end
-					end
-				end	
-				if newgobelen>=1:
-					'Your tapestry is <<newgobelen/10>> percent finished.'
-					act 'Work on the tapestry':
-						*clr & cla
-						menu_off = 1
-						minut+=60
-						gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-						gobramax = (pcs_sewng - 70) * 6
-						gobramin = (pcs_sewng - 70) * 2
-						newgobelen += rand(gobramin,gobramax)
-						gs 'stat'
-						if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-							if newgobelen >= 1000:
-							newgobelen = 0
-							gobelen += 1
-							'Your work on the tapestry is done.'
-						end
-						act 'Set the tapestry aside': gt 'bedrPar', 'start'
+				if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+				if pcs_sewng >= 80:
+					if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+						act'Start a new tapestry':gt 'sewing', 'tapestry'
+					elseif newgobelen >= 1:
+						'Your tapestry is <<newgobelen/10>> percent finished.'
+						act 'Work on the tapestry':gt 'sewing', 'tapestry'
 					end
 				end
-				if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
+				if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 			end
 
 			!! Computer, music and internet use.

locations/belpicknick.qsrc

@@ -236,6 +236,7 @@ if $ARGS[0] = 'dance':
 		
 		fuckerrand = rand(1,4)
 		gmember = fuckerrand
+		killvar'fuckerrand'
 		gs 'belpicknick', 'vibor'
 		if rand(0,1) = 0:
 			'Suddenly the cock you''re currently sucking on is pulled away from you, and <<$boydesc>> pushes you onto your back saying he wants to try another hole now.'

locations/bordel.qsrc

@@ -291,6 +291,8 @@ if $ARGS[0] = 'var':
 	if borrand <= 4 and func('bordel', 'is_open') = 0:
 		'The brothel is closing now, so this is your last chance to work today.'
 	end
+	killvar'borrand'
+	killvar'zpprand'
 end
 
 if $ARGS[0] = 'is_open':

locations/card.qsrc

@@ -7,32 +7,19 @@ gs 'stat'
 
 act 'Put the cards away':
 	killvar '$card_loc'
+	killvar '$papkacard'
+	killvar 'papkarand'
+	killvar 'numcard'
+	killvar 'nomcard'
+	killvar 'card_deck'
 	gt $loc
 end
 act 'Pull a card from the deck':
 	*clr & cla
 	you_slut += 1
 
-	!!if you_slut < 10:end
-
-	if you_slut >= 10 and you_slut < 20:
-		pcs_horny += 1
-	elseif you_slut >= 20 and you_slut < 30:
-		pcs_horny += 2
-	elseif you_slut >= 30 and you_slut < 40:
-		pcs_horny += 3
-	elseif you_slut >= 40 and you_slut < 50:
-		pcs_horny += 4
-	elseif you_slut >= 50 and you_slut < 60:
-		pcs_horny += 5
-	elseif you_slut >= 60 and you_slut < 70:
-		pcs_horny += 6
-	elseif you_slut >= 70 and you_slut < 80:
-		pcs_horny += 7
-	elseif you_slut >= 80 and you_slut < 90:
-		pcs_horny += 8
-	elseif you_slut >= 90 and you_slut < 100:
-		pcs_horny += 9
+	if you_slut >= 10 and you_slut <= 100: 
+		pcs_horny += (you_slut/10)
 	elseif you_slut >= 100:
 		pcs_horny += 10
 	end
@@ -67,15 +54,25 @@ end
 
 if card_deck = 0:
 	act 'Throw away your deck of vintage porn cards': 
-		vcard = 0
+		mc_inventory['vintage_card'] = 0
 		vcard_trash = 1
 		killvar '$card_loc'
+		killvar '$papkacard'
+		killvar 'papkarand'
+		killvar 'numcard'
+		killvar 'nomcard'
+		killvar 'card_deck'
 		gt $loc
 	end
 elseif card_deck = 1:
 	act 'Throw away your deck of new porn cards': 
-		card = 0
+		mc_inventory['card']  = 0
 		killvar '$card_loc'
+		killvar '$papkacard'
+		killvar 'papkarand'
+		killvar 'numcard'
+		killvar 'nomcard'
+		killvar 'card_deck'
 		gt $loc
 	end
 end

locations/city_house_res_misc.qsrc

@@ -166,54 +166,16 @@ if $ARGS[0] = 'livroom':
 	if mc_inventory['sewing_kit'] = 1:
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
 		*nl
-		if gobelen > 0:
-			'You have completed <<gobelen>> tapestries.'
-			*nl
-		end
-		if mc_inventory['sewing_fabric'] <= 0:
-			'You do not have any fabric.'
-		else
-			if pcs_sewng < 40:
-				'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-			elseif pcs_sewng < 80:
-				'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-			else
-				if newgobelen = 0:
-					act'Start a new tapestry (00:15)':
-						*clr & cla
-						menu_off = 1
-						mc_inventory['sewing_fabric'] -= 1
-						newgobelen = 1
-						minut += 15
-						gs'stat'
-						'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-						act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
-					end
-				end
-			end
-		end	
-		if newgobelen >= 1:
-			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry (01:00)':
-				*clr & cla
-				menu_off = 1
-				minut += 60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen += 1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
+		if pcs_sewng >= 80:
+			if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+				act'Start a new tapestry':gt 'sewing', 'tapestry'
+			elseif newgobelen >= 1:
+				'Your tapestry is <<newgobelen/10>> percent finished.'
+				act 'Work on the tapestry':gt 'sewing', 'tapestry'
 			end
 		end
+		if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 	end
-
 end
 
 --- city_house_res_misc ---------------------------------

locations/city_jorahouse.qsrc

@@ -255,8 +255,7 @@ if $ARGS[0] = 'ev14':
 end
 
 if $ARGS[0] = 'ev15':
-	cla
-	*clr
+	cla & *clr
 	klofQW += 1
 	money += 100
 	spafinloc = 11
@@ -275,13 +274,14 @@ if $ARGS[0] = 'ev15':
 	end
 
 	act 'Continue':
-		cla
-		*clr
+		cla & *clr
 		'Jora discharges himself on your face'
 		picrand = rand(18, 20)
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof<<picrand>>.jpg"></center>'
 		'You get dressed and get ready to go home.'
 		'Jora hands you money, "Earned yourself a crumb."'
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -289,8 +289,7 @@ if $ARGS[0] = 'ev15':
 end
 
 if $ARGS[0] = 'ev10':
-	cla
-	*clr
+	cla & *clr
 	gs 'boyStat', 'A45'
 	silavag = 2
 	gs 'arousal', 'bj', 5, 'sub'
@@ -356,6 +355,8 @@ if $ARGS[0] = 'ev 17':
 		'You get dressed and get ready to go home.'
 		'Seymon hands you money, "Earned yourself a crumb."'
 		guy += 1
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -393,6 +394,8 @@ if $ARGS[0] = 'ev 18':
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof18.jpg"></center>'
 		'You get dressed and get ready to go home.'
 		'Seymon hands you money, "Earned yourself a crumb."'
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -441,6 +444,8 @@ if $ARGS[0] = 'ev19':
 	'The boys throw money at you, "Earned yourself a crumb."'
 	guy += 1
 	gang += 1
+	killvar'horand'
+	killvar'picrand'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Go home':gt 'city_residential'
@@ -561,7 +566,6 @@ end
 if $ARGS[0] = 'ev26':
 	cla
 	*clr
-	! WD: Correct Image path ~ "images/characters/city/jora/klof26</center>.jpg"
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/klof26.jpg"></center>'
 	'You show your ass to the boss.'
 	'"Let''s get rid of that dress!" He says.'
@@ -759,7 +763,7 @@ if $ARGS[0] = 'ev34':
 	end
 
 	'"Now I try your ass."'
-
+	killvar'horand'
 	act 'Let him fuck your ass':gt 'city_jorahouse', 'ev35'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
@@ -794,7 +798,8 @@ if $ARGS[0] = 'ev35':
 	end
 
 	'You feel that the boss is ready to cum.'
-
+	killvar'horand'
+	killvar'picrand'
 	act 'Kneel in front of him':gt 'city_jorahouse', 'ev36'
 	act 'Let him end in your ass':gt 'city_jorahouse', 'ev37'
 	act 'Stick his cock in your pussy':gt 'city_jorahouse', 'ev38'
@@ -804,7 +809,7 @@ if $ARGS[0] = 'ev36':
 	cla
 	*clr
 	spafinloc = 11
-gs 'cum_manage'
+	gs 'cum_manage'
 	money += 500
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof30.jpg"></center>'
 	'You jump from his member and start wanking his cock until the boss cums on your face.'
@@ -817,7 +822,7 @@ if $ARGS[0] = 'ev37':
 	cla
 	*clr
 	spafinloc = 3
-gs 'cum_manage'
+	gs 'cum_manage'
 	money += 500
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof32.jpg"></center>'
 	'You start furiously thrusting your ass trying to help him quickly reach orgasm. You fill the warm feeling that tells you he has cum in your ass.'
@@ -882,6 +887,7 @@ if $ARGS[0] = 'ev40':
 	elseif horand > stat['vaginal']:
 		pcs_horny += 10 & 'You are not satisfied'
 	end
+	killvar'horand'
 	act 'Get up and get dressed':gt 'city_jorahouse', 'ev41'
 end
 

locations/city_kafeend.qsrc

@@ -73,14 +73,14 @@ end
 if $ARGS[0] = 'end':
 	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
-
+	killvar 'kafe_rand'
 	act 'Leave': gt 'city_residential'
 end
 
 if $ARGS[0] = 'end_sex':
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
-
+	killvar 'kafe_rand'
 	act 'Leave': gt 'city_residential'
 end
 

locations/city_library.qsrc

@@ -99,7 +99,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'
-		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and understand the subject it describes.'
+		'You spend an hour reading, trying to make sense of all the clever propositions written inside and understand the subject it describes.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
-		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
+		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing world changing magic alongside elves and druids.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -129,7 +129,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI and creating monsters with your hunchbacked assistant.'
+		'You spend an hour reading a science fiction novel - flying off into space, traveling through time, running from rogue AI and creating monsters with your hunchbacked assistant.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 

locations/city_mansion_residence_2.qsrc

@@ -61,53 +61,17 @@ if $ARGS[0] = 'ylounge':
 		if mc_inventory['sewing_kit'] = 1:
 			'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
 			*nl
-			if gobelen > 0:
-				'You have completed <<gobelen>> tapestries.'
-				*nl
-			end
-			if mc_inventory['sewing_fabric'] <= 0:
-				'You do not have any fabric.'
-			else
-				if pcs_sewng < 40:
-					'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-				elseif pcs_sewng < 80:
-					'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-				else
-					if newgobelen = 0:
-						act'Start a new tapestry (00:15)':
-							*clr & cla
-							menu_off = 1
-							mc_inventory['sewing_fabric'] -= 1
-							newgobelen = 1
-							minut += 15
-							gs'stat'
-							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-
-							act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
-						end
-					end
-				end
-			end	
-			if newgobelen >= 1:
-				'Your tapestry is <<newgobelen/10>> percent finished.'
-				act'Work on the tapestry (01:00)':
-					*clr & cla
-					menu_off = 1
-					minut += 60
-					gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-					gobramax = (pcs_sewng - 70) * 6
-					gobramin = (pcs_sewng - 70) * 2
-					newgobelen += rand(gobramin,gobramax)
-					gs'stat'
-					if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-						if newgobelen >= 1000:
-						newgobelen = 0
-						gobelen += 1
-						'Your work on the tapestry is done.'
-					end
-					act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
+			if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+			*nl
+			if pcs_sewng >= 80:
+				if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+					act'Start a new tapestry':gt 'sewing', 'tapestry'
+				elseif newgobelen >= 1:
+					'Your tapestry is <<newgobelen/10>> percent finished.'
+					act 'Work on the tapestry':gt 'sewing', 'tapestry'
 				end
 			end
+			if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 		end
 	end
 end

locations/city_park.qsrc

@@ -376,7 +376,7 @@ if $ARGS[0] = 'luna':
 					else
 						'You can''t even hit one target.'
 					end
-
+					killvar 'tirand'
 					gs 'exp_gain', 'shoot', 1
 
 					act 'Move away':gt 'city_park', 'luna'

locations/dachain.qsrc

@@ -28,8 +28,8 @@ if $args[0] = 'start':
 	*nl
 	'There is a sofa in front of the fireplace, a kitchen alcove opposite the bed and the door to the bathroom next to that.'
 	*nl
-	if stol = 0:$stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
-	if stol = 1:$stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
+	if mc_inventory['desk'] = 0:$stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
+	if mc_inventory['desk'] = 1:$stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
 	'In front of the window there is <<$stol>>.'
 	*nl
 	if mc_inventory['tech_computer'] = 1:

locations/din_bad.qsrc

@@ -236,13 +236,15 @@ if $ARGS[0] = 'd_bag':
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
-	if mc_inventory['refill_bottle'] = 4: 
-		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle'] = 3:
-		'You carry your sports water bottle in your purse. It''s two-thirds full. <a href="exec: mc_inventory[''refill_bottle''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle'] = 2:
-		'You carry your sports water bottle in your purse. It''s one-third full. <a href="exec: mc_inventory[''refill_bottle''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
-	elseif mc_inventory['refill_bottle'] = 1:
+	if mc_inventory['refill_bottle_water'] = 4: 
+		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle_water''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 3:
+		'You carry your sports water bottle in your purse. It''s almost full. <a href="exec: mc_inventory[''refill_bottle_water''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 2:
+		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
+	elseif mc_inventory['refill_bottle_water'] = 1:
+		'You carry your sports water bottle in your purse. It''s almost empty. <a href="exec: mc_inventory[''refill_bottle_water''] = 0 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 0:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
@@ -320,7 +322,11 @@ $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	i = 1
 	'You have <<iif(preziktype < 2, mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms''])>> normal condoms left and	<<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>> sabotaged condoms left.'
@@ -471,7 +477,11 @@ $d_tabletkied = {
 $d_tabletkiedt = {
 	*clr & cla
 	'<center><h1>Birth Control</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	tabloc = 1
 	if thinkpreg = 0 and knowpreg = 0:

locations/gadhouse.qsrc

@@ -462,44 +462,18 @@ if $ARGS[0] = 'main':
 	gs 'events', 'read'
 	gs 'subkid'
 
-	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if mc_inventory['tapestry']>0:'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] > 0:
 		'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-	elseif pcs_sewng >= 40 and mc_inventory['sewing_fabric'] <= 0:
-		'You do not have any fabric.'
 	end
+	if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+
 	if pcs_sewng >= 80:
-		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
-			act'Start a new tapestry':
-				*clr & cla
-				menu_off = 1
-				mc_inventory['sewing_fabric'] -= 1
-				newgobelen = 1
-				minut += 15
-				gs'stat'
-				'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'gadhouse', 'main'
-			end
-		end
-		if newgobelen >= 1:
+		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+			act'Start a new tapestry':gt 'sewing', 'tapestry'
+		elseif newgobelen >= 1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry for an hour':
-				*clr & cla
-				menu_off = 1
-				minut += 60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen+=1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'gadhouse', 'main'
-			end
+			act 'Work on the tapestry':gt 'sewing', 'tapestry'
 		end
 	end
 

locations/gadsarai.qsrc

@@ -61,8 +61,8 @@ if $ARGS[0] = '':
 	end
 	act 'Enter the boars stall': gt 'gadsarai', 'boar'
 	act 'Search around in the barn (0:15)': gt 'gadsarai', 'search'
-	if vcard > 0: act 'View your vintage porn cards': $card_loc = 'gadsarai' & card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards': $card_loc = 'gadsarai' & card_deck = 1 & gt 'card'
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards': $card_loc = 'gadsarai' & card_deck = 0 & gt 'card'
+	 if mc_inventory['card'] > 0: act 'View your new porn cards': $card_loc = 'gadsarai' & card_deck = 1 & gt 'card'
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
 !!	Serpent is not ready yet, so remarking out til then.
 !!	if findneck = 1: act 'You hear a scraping noice above you.':gt 'serpent'
@@ -94,9 +94,9 @@ if $ARGS[0] = 'search':
 		gm_purses[5] = 1
 		$currentpursetype = 'gm'
 		currentpursenumber = 5
-	elseif vcard = 0 and vcard_trash = 0 and rand(0,10) >= 8:
+	elseif mc_inventory['vintage_card'] = 0 and vcard_trash = 0 and rand(0,10) >= 8:
 		*clr & cla
-		vcard = 1
+		mc_inventory['vintage_card'] = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
@@ -337,9 +337,12 @@ if $ARGS[0] = 'barn_room':
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
 	end
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+	if mc_inventory['card'] > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 	gs 'music_actions', 'start'
+
+
 	!! Activities End
 	!! TODO: if winter create task for chopping wood for log stove.
 	!! act 'light log stove': gt  'gadsarai', 'log_stove' 

locations/gargazel.qsrc

@@ -32,22 +32,22 @@ end
 act 'Leave the garage':minut += 5 & gt 'pav_complex', 'garages'
 
 if YouCanGar > 0:
-	'You have stored <<GarTorgItem>> trinkets in the garage currently. Your stepfather allowed you to store some things in his garage but doesn''t want you taking up all his space, he has allowed you to store up to 100 trinkets here. The garage is not very easily accessible; if you want to sell the trinkets at the station, you will have to bring them back home first.'
+	'You have stored <<mc_inventory[''trinkets_garage'']>> trinkets in the garage currently. Your stepfather allowed you to store some things in his garage but doesn''t want you taking up all his space, he has allowed you to store up to 100 trinkets here. The garage is not very easily accessible; if you want to sell the trinkets at the station, you will have to bring them back home first.'
 
-	if tovarL >= 30:
+	if mc_inventory['trinkets_home'] >= 30:
 		'You already have too much stored at home and do not have any more space.'
-	elseif tovarL < 30:
-		perenGarTov = 30 - tovarL
-		'You can bring <<perenGarTov>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
+	elseif mc_inventory['trinkets_home'] < 30:
+		trinkets_can_take = 30 - mc_inventory['trinkets_home']
+		'You can bring <<trinkets_can_take>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
 
-		if GarTorgItem > 0:
-			if GarTorgItem >= perenGarTov:
-				act 'Move <<perenGarTov>> trinkets to your home':
+		if mc_inventory['trinkets_garage'] > 0:
+			if mc_inventory['trinkets_garage'] >= trinkets_can_take:
+				act 'Move <<trinkets_can_take>> trinkets to your home':
 					cls
 					menu_off = 1
 					minut += 60
-					tovarL += perenGarTov
-					GarTorgItem -= perenGarTov
+					mc_inventory['trinkets_home'] += trinkets_can_take
+					mc_inventory['trinkets_garage'] -= trinkets_can_take
 					gs 'stat'
 					'You spend an hour gathering your trinkets from various places, bringing them home and hiding them there.'
 
@@ -55,13 +55,13 @@ if YouCanGar > 0:
 				end
 			end
 
-			if GarTorgItem < perenGarTov:
-				act 'Collect <<GarTorgItem>> trinkets to take with you':
+			if mc_inventory['trinkets_garage'] < trinkets_can_take:
+				act 'Collect <<mc_inventory[''trinkets_garage'']>> trinkets to take with you':
 					cls
 					menu_off = 1
 					minut += 30
-					tovarL += GarTorgItem
-					GarTorgItem = 0
+					mc_inventory['trinkets_home'] += mc_inventory['trinkets_garage']
+					mc_inventory['trinkets_garage'] = 0
 					gs 'stat'
 					'You spend half an hour gathering your trinkets from various places in the garage, putting them in a bag so you can go sell them at the station.'
 

locations/item_stock_db.qsrc

@@ -326,6 +326,17 @@ if $ARGS[0] = 'hardware':
 	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 1000
 	$img_curr_aisle['<<item_idx>>'] = ''
+
+!{	
+	item_idx = 7
+	$item_curr_aisle['<<item_idx>>'] = 'Desk' 
+	$var_curr_aisle['<<item_idx>>'] = 'desk'
+	$desc_curr_aisle['<<item_idx>>'] = 'A shiny new desk.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 1
+	cost_curr_aisle['<<item_idx>>'] = 10000
+	$img_curr_aisle['<<item_idx>>'] = ''
+}
 end
 
 !!Added

locations/kit_din.qsrc

@@ -397,7 +397,6 @@ $edagotpk = {
 	end
 	edahot += 1
 	mc_inventory['food_basic'] -= 1
-	kuhdrova = 0
 	musor += 1
 	if $loc ! 'uni_dorm': mc_inventory['dish_plates'] -= 1
 	pcs_mood -= 5
@@ -533,12 +532,12 @@ $driwater = {
 
 $fill_bottle = {
 	delact 'Fill your water bottle (0:01)'
-	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle'] < 4:
+	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle_water'] < 4:
 		*nl
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':
 			minut += 1
-			mc_inventory['refill_bottle'] = 4
+			mc_inventory['refill_bottle_water'] = 4
 			gt $loc, $loc_arg
 		end
 	end

locations/pav_complex.qsrc

@@ -123,14 +123,14 @@ if $ARGS[0] = 'start':
 		if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 	end
 
-	if seenAD = 1 and pavSharedAptEnabled = 0: '<br>Some guys in one of the <a href="exec:minut += 5 & gt ''pav_shared_apt'',''doorNo30''">apartments</a> are looking for a roommate.'
+	if shared_apt['seenAd'] = 1 and shared_apt['enabled'] = 0: '<br>Some guys in one of the <a href="exec:minut += 5 & gt ''pav_shared_apt'',''doorNo30''">apartments</a> are looking for a roommate.'
 	
 	if rolanmeet = 8 and rolanblockhome ! 1: '<br>Mr. Matveev''s is living in an <a href="exec:minut += 5 & gt ''rolanapt'',''home''">apartment</a> in the Five Eight Estate.'
 	
 !!	if mid($start_type,1,2) = 'sg': '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
 	
 	if func('homes_properties', 'has_access', 'parents_home'): act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
-	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
+	if shared_apt['enabled'] = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
 	act 'Walk to the Residential area (0:02)':minut += 2 & gt 'pav_residential'
 	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
-	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):
+	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or shared_apt['enabled'] = 1):
 		act 'Go to your parent''s apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	end
 !!	if mid($start_type,1,2) = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'

locations/pav_complexb3.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'etaj_4':
 	'<center>The fourth floor stairwell was renovated not long ago, but some hoodlums have already sprayed graffiti on the walls.</center>'
 	act 'Go down to the third floor': minut +=1 & gt 'pav_complexb3','etaj_3'
 	act 'Go up to the fifth floor': minut +=1 & gt 'pav_complexb3','etaj_5'
-	if seenAd = 0:
+	if shared_apt['seenAd'] = 0:
 		gt 'pav_shared_apt', 'advertNo30'
 	else
 		act 'Apartment 30: Shared apartment': gt 'pav_shared_apt', 'doorNo30'

locations/pav_shared_apt.qsrc

@@ -4,18 +4,18 @@ gs 'themes', 'indoors'
 close all
 
 if $ARGS[0] = 'update':
-	rentWeekly = 2000
-	if rentLeft <= 0:rentLeft = 0
+	shared_apt['rentWeekly']= 2000
+	if shared_apt['rentLeft'] <= 0:shared_apt['rentLeft'] = 0
 	!how much of the unpaid weekly rent is left
 	if orgB > 100:orgB = 100
 
-	price_cook = 50
-	price_clean = 50
-	price_handjob = 50
-	price_blowjob = 100
-	price_vaginal = 150
-	price_anal = 200
-	price_special = 250
+	shared_apt['price_cook'] = 50
+	shared_apt['price_clean'] = 50
+	shared_apt['price_handjob'] = 50
+	shared_apt['price_blowjob'] = 100
+	shared_apt['price_vaginal'] = 150
+	shared_apt['price_anal'] = 200
+	shared_apt['price_special'] = 250
 
 	! time calculations
 	weekNum = (daystart - (daystart mod 7)) / 7
@@ -24,72 +24,70 @@ if $ARGS[0] = 'update':
 	$pcs_font = '990099'
 		!pink
 
-	! servitudeLvl = 0 - no service, pays rent
-	! servitudeLvl = 1 - nonsexual service
-	! servitudeLvl = 2 - sexual and nonsexual service
+	! shared_apt['servitudeLvl'] = 0 - no service, pays rent
+	! shared_apt['servitudeLvl'] = 1 - nonsexual service
+	! shared_apt['servitudeLvl'] = 2 - sexual and nonsexual service
 
 
-	$oleg_font = '0096FF'
-		!blue
-	oleg_leaves = 9
-	oleg_comes = 18
-	oleg_sleeps = 23
-	oleg_wakes = 8
+	$Oleg['font'] = '007bff'		&!blue
+	Oleg['leaves'] = 9
+	Oleg['comes'] = 18
+	Oleg['sleeps'] = 23
+	Oleg['wakes'] = 8
 
 
-	$nestor_font = 'CC0000'
-		!red
-	nestor_leaves = 11
-	nestor_comes = 19
-	nestor_sleeps = 23
-	nestor_wakes = 9
+	$Nestor['font'] = '8a0000'		&!red
+	Nestor['leaves'] = 11
+	Nestor['comes'] = 19
+	Nestor['sleeps'] = 23
+	Nestor['wakes'] = 9
 
 
-	$yakov_font = '009900'
-		!green
-	yakov_leaves = 7
-	yakov_comes = 16
-	yakov_sleeps = 22
-	yakov_wakes = 5
+	$Yakov['font'] = '017a01'		&!green
+	Yakov['leaves'] = 7
+	Yakov['comes'] = 16
+	Yakov['sleeps'] = 22
+	Yakov['wakes'] = 5
 		!flag if there was already a sex between him and Sveta
-		!yakov_bj ; yakov_bjDeep ; yakov_swall ; yakov_vag ; yakov_vagCumInside ; yakov_vagCumInsideUnwanted ; yakov_anal ; yakov_analCumInside ; yakov_analCumInsideUnwanted
+		!Yakov['bj'] ; Yakov['bjDeep'] ; Yakov['swall'] ; Yakov['vag'] ; Yakov['vagCumInside'] ; Yakov['vagCumInsideUnwanted'] ; Yakov['anal'] ; Yakov['analCumInside'] ; Yakov['analCumInsideUnwanted']
 
 	!mood setup
-	$oleg_mood = iif(oleg_mood = 1, 'great', '') + iif(oleg_mood = 2, 'good', '') + iif(oleg_mood = 3, 'nice', '') + iif(oleg_mood = 4, 'fine', '') + iif(oleg_mood = 5, 'neutral', '') + iif(oleg_mood = 6, 'okay', '') + iif(oleg_mood = 7, 'bad', '') + iif(oleg_mood = 8, 'terrible', '') + iif(oleg_mood = 9, 'awful', '') + iif(oleg_mood = 10, 'horrible', '')
-	$nestor_mood = iif(nestor_mood = 1, 'great', '') + iif(nestor_mood = 2, 'good', '') + iif(nestor_mood = 3, 'nice', '') + iif(nestor_mood = 4, 'fine', '') + iif(nestor_mood = 5, 'neutral', '') + iif(nestor_mood = 6, 'okay', '') + iif(nestor_mood = 7, 'bad', '') + iif(nestor_mood = 8, 'terrible', '') + iif(nestor_mood = 9, 'awful', '') + iif(nestor_mood = 10, 'horrible', '')
-	$yakov_mood = iif(yakov_mood = 1, 'great', '') + iif(yakov_mood = 2, 'good', '') + iif(yakov_mood = 3, 'nice', '') + iif(yakov_mood = 4, 'fine', '') + iif(yakov_mood = 5, 'neutral', '') + iif(yakov_mood = 6, 'okay', '') + iif(yakov_mood = 7, 'bad', '') + iif(yakov_mood = 8, 'terrible', '') + iif(yakov_mood = 9, 'awful', '') + iif(yakov_mood = 10, 'horrible', '')
+	$Oleg['mood'] = iif(Oleg['mood'] = 1, 'great', '') + iif(Oleg['mood'] = 2, 'good', '') + iif(Oleg['mood'] = 3, 'nice', '') + iif(Oleg['mood'] = 4, 'fine', '') + iif(Oleg['mood'] = 5, 'neutral', '') + iif(Oleg['mood'] = 6, 'okay', '') + iif(Oleg['mood'] = 7, 'bad', '') + iif(Oleg['mood'] = 8, 'terrible', '') + iif(Oleg['mood'] = 9, 'awful', '') + iif(Oleg['mood'] = 10, 'horrible', '')
+	$Nestor['mood'] = iif(Nestor['mood'] = 1, 'great', '') + iif(Nestor['mood'] = 2, 'good', '') + iif(Nestor['mood'] = 3, 'nice', '') + iif(Nestor['mood'] = 4, 'fine', '') + iif(Nestor['mood'] = 5, 'neutral', '') + iif(Nestor['mood'] = 6, 'okay', '') + iif(Nestor['mood'] = 7, 'bad', '') + iif(Nestor['mood'] = 8, 'terrible', '') + iif(Nestor['mood'] = 9, 'awful', '') + iif(Nestor['mood'] = 10, 'horrible', '')
+	$Yakov['mood'] = iif(Yakov['mood'] = 1, 'great', '') + iif(Yakov['mood'] = 2, 'good', '') + iif(Yakov['mood'] = 3, 'nice', '') + iif(Yakov['mood'] = 4, 'fine', '') + iif(Yakov['mood'] = 5, 'neutral', '') + iif(Yakov['mood'] = 6, 'okay', '') + iif(Yakov['mood'] = 7, 'bad', '') + iif(Yakov['mood'] = 8, 'terrible', '') + iif(Yakov['mood'] = 9, 'awful', '') + iif(Yakov['mood'] = 10, 'horrible', '')
 	
 
 	gs 'stat'
 
-	if pavSharedAptDebug = 0:
-	elseif pavSharedAptDebug = 1:
-		'<a href="exec:pavSharedAptDebug=2">Debug</a>'
-	elseif pavSharedAptDebug = 2:
-		'<a href="exec:pavSharedAptDebug=1">Debug Close</a>'
-		'<a href="exec:pavSharedAptDebug=0">Debug Disable</a>'
-		$npc_firstname['A266']+' relationship: '+npc_rel['A266']
-		$npc_firstname['A265']+' relationship: '+npc_rel['A265']
-		$npc_firstname['A264']+' relationship: '+npc_rel['A264']
-		'rentLeft: ' + rentLeft
-		'weekNum: ' + weekNum
-		'rentWeekNum: ' + rentWeekNum
-		'servitudeLvl: ' + servitudeLvl
-		'servicePaid: ' + servicePaid
-		'cashPaid: ' + cashPaid
-		'step: ' + step
-		'subStep: ' + subStep
-		'nestor_mood: ' + nestor_mood
-		'oleg_mood: ' + oleg_mood
-		'yakov_mood: ' + yakov_mood
+	if shared_apt['debug'] = 0:
+	elseif shared_apt['debug'] = 1:
+		'<a href="exec:shared_apt[''debug'']=2">Debug</a>'
+	elseif shared_apt['debug'] = 2:
+		'<a href="exec:shared_apt[''debug'']=1">Debug Close</a>'
+		'<a href="exec:shared_apt[''debug'']=0">Debug Disable</a>'
+		'<<$npc_firstname[''A266'']>> relationship: <<$npc_rel[''A266'']>>'
+		'<<$npc_firstname[''A265'']>> relationship: <<$npc_rel[''A265'']>>'
+		'<<$npc_firstname[''A264'']>> relationship: <<$npc_rel[''A264'']>>'
+		'rentLeft: '	 + shared_apt['rentLeft']
+		'weekNum: '		 + shared_apt['weekNum']
+		'rentWeekNum: '  + shared_apt['rentWeekNum']
+		'servitudeLvl: ' + shared_apt['servitudeLvl']
+		'servicePaid: '  + shared_apt['servicePaid']
+		'cashPaid: ' 	 + shared_apt['cashPaid']
+		'step: ' 		 + shared_apt['step']
+		'subStep: ' 	 + shared_apt['subStep']
+		'Nestor mood: '  + Nestor['mood']
+		'Oleg mood: ' 	 + Oleg['mood']
+		'Yakov mood: '	 + Yakov['mood']
 		''
-		oleg_served = 0
-		oleg_mood = 1
-		nestor_served = 0
-		nestor_mood = 1
-		yakov_mood = 1
-		yakov_served = 0
+		Oleg['served'] = 0
+		Oleg['mood'] = 1
+		Nestor['served'] = 0
+		Nestor['mood'] = 1
+		Yakov['mood'] = 1
+		Yakov['served'] = 0
 	end
+
 end
 
 ! accomodation advert
@@ -98,7 +96,7 @@ if $ARGS[0] = 'advertNo30':
 	$menu_arg = 'advertNo30'
 	menu_off = 1
 	minut += 2
-	seenAd = 1
+	shared_apt['seenAd'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
 	'<br>As you pass by the advertisements, you notice a sign - "сдаeтся в аренду комната" (Room for rent!). Some guys are looking for a roommate. They live in an apartment in one of the other buildings in the apartment complex.'
@@ -112,7 +110,7 @@ if $ARGS[0] = 'doorNo30':
 	$menu_arg = 'doorNo30'
 	menu_off = 1
 	act 'Go back outside':gt 'pav_complex', 'start'
-	if pavSharedAptEnabled = 1:
+	if shared_apt['enabled'] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
 		'<br>You stand before the entry door to apartment No 30, the apartment you share with three others'
 		act 'Go inside':gt 'pav_shared_apt', 'start'
@@ -133,11 +131,10 @@ if $ARGS[0] = 'start':
 	$locM_arg = 'start'
 	$loc = 'pav_shared_apt'
 	$loc_arg = 'start'
-	$goBack = $loc_arg
 	$location_type = 'private'
 	killvar '$locclass'
 	gs 'pav_shared_apt', 'update'
-	if introDone = 0:gt 'pav_shared_apt', 'intro'
+	if shared_apt['introDone'] = 0:gt 'pav_shared_apt', 'intro'
 	minut += 2
 	gs 'stat'
 	
@@ -147,27 +144,27 @@ if $ARGS[0] = 'start':
 	if daystart >= tomorrow:
 		tomorrow = daystart + 1
 
-		oleg_mood = rand(1, 10)
-		oleg_cleaned = 0
+		Oleg['mood'] = rand(1, 10)
+		Oleg['cleaned'] = 0
 
-		nestor_mood = rand(1, 10)
-		nestor_cleaned = 0
+		Nestor['mood'] = rand(1, 10)
+		Nestor['cleaned'] = 0
 
-		yakov_mood = rand(1, 10)
-		yakov_cleaned = 0
+		Yakov['mood'] = rand(1, 10)
+		Yakov['cleaned'] = 0
 	end
 
 	! do this every time
-	rentLeft = rentWeekly - servicePaid - cashPaid
+	shared_apt['rentLeft'] = shared_apt['rentWeekly'] - shared_apt['servicePaid'] - shared_apt['cashPaid']
 
 	'<center><h3>Hallway</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/hallway.jpg"></center>'
-	'It is week number <<weekNum>>.'
+	'It is week number <<shared_apt[''weekNum'']>>.'
 
-	if weekNum < rentWeekNum:
-		if rentLeft > 0:
-			'You have <<rentLeft>> <b>₽</b> of rent left to pay for the next week.'
-			if servitudeLvl >= 1:
+	if shared_apt['weekNum']  <  shared_apt['rentWeekNum']:
+		if shared_apt['rentLeft'] > 0:
+			'You have <<shared_apt[''rentLeft'']>> <b>₽</b> of rent left to pay for the next week.'
+			if shared_apt['servitudeLvl'] >= 1:
 				'You may still pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, if you want.'
 			else
 				'Pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>.'
@@ -176,24 +173,24 @@ if $ARGS[0] = 'start':
 			'You have already paid the whole rent for the next week.'
 			'You can end your rental agreement and leave the apartment if you don''t want to stay here anymore.'
 		end
-	elseif weekNum >= rentWeekNum:
-		if rentLeft = 0:
+	elseif shared_apt['weekNum']  >=  shared_apt['rentWeekNum']:
+		if shared_apt['rentLeft'] = 0:
 			!rent was forepaid, everything OK, proceed to next week
-			rentLeft += 2000
-			cashPaid = 0
-			servicePaid = 0			
-			rentWeekNum = weekNum + 1
-		elseif rentLeft > 0:
+			shared_apt['rentLeft'] += 2000
+			shared_apt['cashPaid'] = 0
+			shared_apt['servicePaid'] = 0			
+			shared_apt['rentWeekNum'] = shared_apt['weekNum']  + 1
+		elseif shared_apt['rentLeft'] > 0:
 			!rent was not fully paid
-			'You did not pay the whole rent for this week. You still have to pay <<rentLeft>> <b>₽</b>.'
-			if money >= rentLeft:
+			'You did not pay the whole rent for this week. You still have to pay <<shared_apt[''rentLeft'']>> <b>₽</b>.'
+			if money >= shared_apt['rentLeft']:
 				!not enough cash to pay it manually
 				'You still can pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, otwerwise you''ll be kicked out!'
 			else
 				!in future add some way to serve your way out
 				'You do not have enough money to pay the rest of the rent in cash, even if you wanted to. Guess you''ll have to find a new living place...'
-				rentPaid = 0
-				pavSharedAptEnabled = 0
+				shared_apt['rentPaid'] = 0
+				shared_apt['enabled'] = 0
 				gs 'homes_properties', 'block_access', 'shared_apartment', 0
 			end
 		end
@@ -212,25 +209,25 @@ if $ARGS[0] = 'start':
 		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
 	end
 	
-	if rentPaid = 1:
-		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pav_shared_oleg'', ''oleg_dick''"><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''nestor_Dick''"><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''yakov_Dick''"><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>></font></a>.'
+	if shared_apt['rentPaid'] = 1:
+		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pav_shared_oleg'', ''Oleg_dick''"><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''Nestor_Dick''"><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''Yakov_Dick''"><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>></font></a>.'
 		'You stand in the hallway.'
 		*nl
-		'From the hallway, several doors lead to <a href="exec:gt ''pav_shared_apt'', ''oleg_Room''"><<$npc_firstname[''A266'']>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''nestor_Room''"><<$npc_firstname[''A265'']>>''s</a>, and <a href="exec:gt ''pav_shared_apt'', ''yakov_Room''"><<$npc_firstname[''A264'']>>''s</a> rooms.'
+		'From the hallway, several doors lead to <a href="exec:gt ''pav_shared_apt'', ''Oleg_Room''"><<$npc_firstname[''A266'']>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''Nestor_Room''"><<$npc_firstname[''A265'']>>''s</a>, and <a href="exec:gt ''pav_shared_apt'', ''Yakov_Room''"><<$npc_firstname[''A264'']>>''s</a> rooms.'
 		'The last doors lead to the <a href="exec:gt ''pav_shared_apt'', ''pcsRoom''">room</a> you have rented.'
 		*nl
 		!! Wardrobe is here because Sveta''s bedroom is actually the unused living room, with no wardrobe, so she is using the hall cupboard.
 		'There are no cupboards in your living room cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''start''">closets</a> that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
 		*nl
-		if servitudeLvl >= 1:'A computer-printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
+		if shared_apt['servitudeLvl'] >= 1:'A computer-printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
 		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'
 		act 'Go to the bathroom':gt 'pav_shared_apt', 'bathroom'
 		act 'Go to the kitchen':gt 'pav_shared_apt', 'kitchen'
-		act '<font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>>''s room</font>':gt 'pav_shared_apt', 'oleg_Room'
-		act '<font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>>''s room</font>':gt 'pav_shared_apt', 'nestor_Room'
-		act '<font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>>''s room</font>':gt 'pav_shared_apt', 'yakov_Room'
+		act '<font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>>''s room</font>':gt 'pav_shared_apt', 'Oleg_Room'
+		act '<font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>>''s room</font>':gt 'pav_shared_apt', 'Nestor_Room'
+		act '<font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>>''s room</font>':gt 'pav_shared_apt', 'Yakov_Room'
 		gs 'wardrobe', 'default_clothing_options'
-		if rentLeft = 0:
+		if shared_apt['rentLeft'] = 0:
 			act '<font color=red>End your rental agreement and move out</font>':gt 'pav_shared_apt', 'eoleg_agreement'
 		end
 
@@ -242,29 +239,28 @@ if $ARGS[0] = 'start':
 	!! NOTE:If Sveta has access to her parents home then she leaves the kids there
 	if func('homes_properties', 'has_access', 'parents_home') = 0 and kid > 0:
 		*clr & cla
-		pavIntroStep = 0
-		introDone = 0
+		shared_apt['pavIntroStep'] = 0
+		shared_apt['introDone'] = 0
 		minut += 5
 		!Need to have some actual story to this with NPC reactions.
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 		'You''ve been kicked out of the apartment for having children.'
-		pavSharedAptEnabled = 0
+		shared_apt['enabled'] = 0
 		gs 'homes_properties', 'block_access'
 		act 'Leave':gt 'pav_complex', 'start'
 	end
-	if $clothingworntype = 'nude' and pavSharedAptEnabled = 0: gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gs 'shoes', 'wear', 'last_worn' & gs 'stat'
+	if $clothingworntype = 'nude' and shared_apt['enabled'] = 0: gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gs 'shoes', 'wear', 'last_worn' & gs 'stat'
 end
 
 if $ARGS[0] = 'payCash':
 	menu_off = 1
 	minut += 2
-	cash = rentLeft
-	if money >= cash:
-		'You have decided to pay the remainder of the weekly rent ('+cash+'<b>₽</b>) with cash.'
-		cashPaid += cash
-		money -= cash
-		rentPaid = 1
-		pavSharedAptEnabled = 1
+	if money >= shared_apt['rentLeft']:
+		'You have decided to pay the remainder of the weekly rent ('+shared_apt['rentLeft']+'<b>₽</b>) with cash.'
+		shared_apt['cashPaid'] += shared_apt['rentLeft']
+		money -= shared_apt['rentLeft']
+		shared_apt['rentPaid'] = 1
+		shared_apt['enabled'] = 1
 		gs 'homes_properties', 'give_access'
 	else
 		'You do not have enough cash to pay for the rest of your rent.'
@@ -275,42 +271,42 @@ end
 if $ARGS[0] = 'payService':
 	menu_off = 1
 	minut += 1
-	'The amount '+price+' <b>₽</b> was taken off of your weekly rent.'
-	servicePaid += price
+	'The amount '+shared_apt['price']+' <b>₽</b> was taken off of your weekly rent.'
+	shared_apt['servicePaid'] += shared_apt['price']
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'rentSetup':
 	menu_off = 1
 	minut += 2
-	'You get a list of paper, saying the weekly rent is <<rentWeekly>> rubles.'
-	rentPaid = 1
-	introDone = 1
-	rentWeekNum = (daystart - (daystart mod 7)) / 7 + 1
+	'You get a list of paper, saying the weekly rent is <<shared_apt[''rentWeekly'']>> <b>₽</b>.'
+	shared_apt['rentPaid'] = 1
+	shared_apt['introDone'] = 1
+	 shared_apt['rentWeekNum'] = (daystart - (daystart mod 7)) / 7 + 1
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'intro':
 	menu_off = 1
 	gs 'pav_shared_apt', 'update'
-	if step > 0:
-		'<center><img border="5" bordercolor="<<$yakov_font>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
+	if shared_apt['step'] > 0:
+		'<center><img border="5" bordercolor="<<$Yakov[''font'']>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 		''
 	end
 
-	if pavIntroStep = 0:
+	if shared_apt['pavIntroStep'] = 0:
 		minut += 2
-		pavIntroStep = 1
+		shared_apt['pavIntroStep'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
 		''
 		'The door is opened by a young, nice-looking athletic man.'
-		'<font color=#<<$yakov_font>>>"Hi sweetie! What do you need?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Hi sweetie! What do you need?"</font>'
 		'<font color=#<<$pcs_font>>>"Hello, my name is <<$pcs_firstname>> <<$pcs_lastname>>. I''ve seen the advert that someone here have a spare room for rent?"</font>'
-		'<font color=#<<$yakov_font>>>"Yeah, that''s true. Come in, I''ll call the guys and we can talk about it. I''m <<$npc_firstname[''A264'']>> by the way."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yeah, that''s true. Come in, I''ll call the guys and we can talk about it. I''m <<$npc_firstname[''A264'']>> by the way."</font>'
 		act 'Go in':gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 1:
+	elseif shared_apt['pavIntroStep'] = 1:
 		minut += 3
-		pavIntroStep = 2
+		shared_apt['pavIntroStep'] = 2
 		'You enter a hallway filled with coats and shoes, indicating that 3 or 4 people live here.'
 		'The guy disappears into one of the rooms, and you overhear him talking to someone.'
 		'They attempt to speak quietly, but you catch a sentence or two...:'
@@ -318,17 +314,17 @@ if $ARGS[0] = 'intro':
 		'"...a girl, I tell you..." "...nice one, really, with nice round features, man..." "...better than another guy, idiot..." "...ok, ok, just be done with it..."'
 		''
 		'After a while, three young men emerge in the hallway.'
-		'<font color=#<<$yakov_font>>>"So, that''s her, guys. <<$pcs_firstname>>, could you introduce yourself to these guys?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So, that''s her, guys. <<$pcs_firstname>>, could you introduce yourself to these guys?"</font>'
 		'<font color=#<<$pcs_font>>>"Hello, I''m <<$pcs_firstname>> <<$pcs_lastname>>. I''d like to rent the empty room in your apartment."</font>'
-		'<font color=#<<$nestor_font>>>"Well, now that''s what I like! Finally, this won''t be such a dull party!"</font>'
-		'<font color=#<<$oleg_font>>>"<<$pcs_firstname>>, please excuse my friend, <<$npc_firstname[''A265'']>>. He can be quite rude. I''m <<$npc_firstname[''A266'']>>."</font>'
-		'<font color=#<<$nestor_font>>>"Yup, I''m <<$npc_firstname[''A265'']>>."</font>'
-		'<font color=#<<$oleg_font>>>"So, you want to live here with us?"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Well, now that''s what I like! Finally, this won''t be such a dull party!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$pcs_firstname>>, please excuse my friend, <<$npc_firstname[''A265'']>>. He can be quite rude. I''m <<$npc_firstname[''A266'']>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Yup, I''m <<$npc_firstname[''A265'']>>."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"So, you want to live here with us?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, I need a new place to stay."</font>'
-		'<font color=#<<$nestor_font>>>"How old are you, girl?"</font>'
-		'<font color=#<<$oleg_font>>>"<<$npc_firstname[''A265'']>>, not this again!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"How old are you, girl?"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$npc_firstname[''A265'']>>, not this again!"</font>'
 		'<font color=#<<$pcs_font>>>"It''s okay. I''m actually <<age>> years old. Why do you ask?"</font>'
-		'<font color=#<<$oleg_font>>>"He''s just an idiot; don''t listen to him."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"He''s just an idiot; don''t listen to him."</font>'
 			
 		if age < 18:
 			'(You can see <<$npc_firstname[''A265'']>> rub his crotch just a brief moment after you told him your age. What''s he up to?)'
@@ -336,129 +332,129 @@ if $ARGS[0] = 'intro':
 		if knowpreg = 1:
 			act 'Ask about children':
 				cla
-				pavIntroStep = 50
+				shared_apt['pavIntroStep'] = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell you, I''m currently pregnant. How do you feel about having children in the apartment, will this be a problem?"</font>'
 				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		elseif kid > 0:
 			act 'Ask about children':
 				cla
-				pavIntroStep = 50
+				shared_apt['pavIntroStep'] = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell, I''m a mother. How do you feel about having children in the apartment, will this be a problem?"</font>'
 				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
 			act 'Continue':gt 'pav_shared_apt', 'intro'
 		end
-	elseif pavIntroStep = 2:
+	elseif shared_apt['pavIntroStep'] = 2:
 		minut += 3
-		pavIntroStep = 3
+		shared_apt['pavIntroStep'] = 3
 		'<font color=#<<$pcs_font>>>"So what do you guys say, will you take me in?"</font>'
-		'<font color=#<<$oleg_font>>>"We may. But first, do you have the money to pay the rent?"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We may. But first, do you have the money to pay the rent?"</font>'
 		'<font color=#<<$pcs_font>>>"Well, of course I don''t expect to let me live here for free. But I hope the rent is reasonable..."</font>'
-		'<font color=#<<$oleg_font>>>"It is indeed."</font>'
-		'<font color=#<<$yakov_font>>>"<<rentWeekly>> rubles. Per week."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"It is indeed."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"<<shared_apt[''rentWeekly'']>> rubles. Per week."</font>'
 		'<font color=#<<$pcs_font>>>"Uhm. That''s quite a lot. I''m not sure if I''ll be able to afford this..."</font>'
-		'<font color=#<<$nestor_font>>>"You can pay other ways if you''d like!"</font>'
-		'<font color=#<<$oleg_font>>>"<<$npc_firstname[''A265'']>>!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"You can pay other ways if you''d like!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$npc_firstname[''A265'']>>!"</font>'
 		'<font color=#<<$pcs_font>>>"What do you mean by other ways?"</font>'
-		'<font color=#<<$yakov_font>>>"Well <<$pcs_firstname>>, since we are just guys here, and since we suck at these things, we could use someone as you, a girl I mean, to be something like our, let''s say, handmaiden. If you know what I mean."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Well <<$pcs_firstname>>, since we are just guys here, and since we suck at these things, we could use someone as you, a girl I mean, to be something like our, let''s say, handmaiden. If you know what I mean."</font>'
 		'<font color=#<<$pcs_font>>>"Like cooking and cleaning?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, exactly."</font>'
-		'<font color=#<<$nestor_font>>>"And more."</font>'
-		'<font color=#<<$oleg_font>>>"Oh my... I give up."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, exactly."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"And more."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Oh my... I give up."</font>'
 		act 'More what?':gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 3:
+	elseif shared_apt['pavIntroStep'] = 3:
 		minut += 3
-		'<font color=#<<$nestor_font>>>"More services."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"More services."</font>'
 		'<font color=#<<$pcs_font>>>"What kind of "services"?"</font>'
-		'<font color=#<<$yakov_font>>>"the adult kind of services."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"the adult kind of services."</font>'
 		'<font color=#<<$pcs_font>>>"You mean to be a whore for you? Instead of paying the rent???"</font>'
-		'<font color=#<<$oleg_font>>>"Please <<$pcs_firstname>>, don''t get mad. <<$npc_firstname[''A265'']>> is not just an idiot, he is a rude idiot. We are definitely not asking you to be our whore or something like that."</font>'
-		'<font color=#<<$oleg_font>>>" As <<$npc_firstname[''A264'']>> told you, we could decrease your rent if you would do some housekeeping stuff we really suck at. But only if you want, of course."</font>'
-		'<font color=#<<$yakov_font>>>"So what do you say <<$pcs_firstname>>?"</font>'
-		act 'Say that you changed your mind about this':pavIntroStep = 40 & gt 'pav_shared_apt', 'intro'
-		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 10 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 20 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 30 & gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 10:
+		'<font color=#<<$Oleg[''font'']>>>"Please <<$pcs_firstname>>, don''t get mad. <<$npc_firstname[''A265'']>> is not just an idiot, he is a rude idiot. We are definitely not asking you to be our whore or something like that."</font>'
+		'<font color=#<<$Oleg[''font'']>>>" As <<$npc_firstname[''A264'']>> told you, we could decrease your rent if you would do some housekeeping stuff we really suck at. But only if you want, of course."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So what do you say <<$pcs_firstname>>?"</font>'
+		act 'Say that you changed your mind about this':shared_apt['pavIntroStep'] = 40 & gt 'pav_shared_apt', 'intro'
+		act 'Say you will pay the rent the normal way':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 10 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind doing the homekeeping stuff':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 20 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind anything':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 30 & gt 'pav_shared_apt', 'intro'
+	elseif shared_apt['pavIntroStep'] = 10:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$yakov_font>>>"So the room is over there.</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So the room is over there.</font>'
 		'<font color=#<<$pcs_font>>>"Wait, Isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>""Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"'
-		'<font color=#<<$oleg_font>>>"Have a nice day <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>""Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later guys!"</font>'
-		servitudeLvl = 0
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 20:
+		shared_apt['servitudeLvl'] = 0
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 20:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$oleg_font>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
 		'<font color=#<<$pcs_font>>>"Cool!"</font>'
-		'<font color=#<<$yakov_font>>>"So the room is over there."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So the room is over there."</font>'
 		'<font color=#<<$pcs_font>>>"Wait, Isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"</font>'
-		'<font color=#<<$oleg_font>>>"Have a nice day, <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later, girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day, <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later, girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later, guys!"</font>'
 			
-		servitudeLvl = 1
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 30:
+		shared_apt['servitudeLvl'] = 1
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 30:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So, the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So, the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$oleg_font>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
-		'<font color=#<<$nestor_font>>>"The extra stuff services will be there too, girl."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"The extra stuff services will be there too, girl."</font>'
 		'<font color=#<<$pcs_font>>>"OK..."</font>'
-		'<font color=#<<$yakov_font>>>"So, the room is over there."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So, the room is over there."</font>'
 		'<font color=#<<$pcs_font>>>"Wait, isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, it is, but we don''t use it, so we are renting it out. There is all you need, a bed, a table with a chair, all this stuff. Just move in when you want, we even put a curtain over the doorway. See you later, <<$pcs_firstname>>!"</font>'
-		'<font color=#<<$oleg_font>>>"Have a nice day, <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later, girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, it is, but we don''t use it, so we are renting it out. There is all you need, a bed, a table with a chair, all this stuff. Just move in when you want, we even put a curtain over the doorway. See you later, <<$pcs_firstname>>!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day, <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later, girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later, guys!"</font>'
-		servitudeLvl = 2
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 40:
+		shared_apt['servitudeLvl'] = 2
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 40:
 		minut += 2
-		'<font color=#<<$oleg_font>>>"I told you idiot not to scare her away!"</font>'
-		'<font color=#<<$nestor_font>>>"Sorry man! We can still lock her to the radiator like I suggested in the first place..."</font>'
-		'<font color=#<<$oleg_font>>>"Just shut up already!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"I told you idiot not to scare her away!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Sorry man! We can still lock her to the radiator like I suggested in the first place..."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Just shut up already!"</font>'
 		''
-		'<font color=#<<$yakov_font>>>"Sorry <<$pcs_firstname>>. We respect your decision. If you change your mind and the room is still empty, let us know and we can talk again. Goodbye!"</font>'
-		act 'Tell them goodbye and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
-	elseif pavIntroStep = 50:
+		'<font color=#<<$Yakov[''font'']>>>"Sorry <<$pcs_firstname>>. We respect your decision. If you change your mind and the room is still empty, let us know and we can talk again. Goodbye!"</font>'
+		act 'Tell them goodbye and leave':shared_apt['pavIntroStep'] = 0 & gt 'pav_complex', 'start'
+	elseif shared_apt['pavIntroStep'] = 50:
 		minut += 2
 		!add dialogue for returning after being previously expelled from apartment
-		'<font color=#<<$oleg_font>>>"I''m sorry <<$pcs_firstname>>, but we don''t want children or pets in the apartment!"</font>'
-		'<font color=#<<$nestor_font>>>"If you get rid of the kid, come back and see us."</font>'
-		'<font color=#<<$yakov_font>>>"Don''t mind him. There''s simply not enough room for 4 people, plus kids or pets. I hope you understand"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"I''m sorry <<$pcs_firstname>>, but we don''t want children or pets in the apartment!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"If you get rid of the kid, come back and see us."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Don''t mind him. There''s simply not enough room for 4 people, plus kids or pets. I hope you understand"</font>'
 		if func('homes_properties', 'has_access', 'parents_home'):
 			act 'Suggest a compromise':
 				cla
-				pavIntroStep = 2
+				shared_apt['pavIntroStep'] = 2
 				'<font color=#<<$pcs_font>>>"I can leave them with my parents for the time being, and keep them away from the apartment, how does this sound?'
-				'<font color=#<<$yakov_font>>>"Are you certain you want to do this?"</font>'
-				'<font color=#<<$nestor_font>>>"Sounds good to me!"</font>'
-				'<font color=#<<$oleg_font>>>"hmmmm"</font>'
+				'<font color=#<<$Yakov[''font'']>>>"Are you certain you want to do this?"</font>'
+				'<font color=#<<$Nestor[''font'']>>>"Sounds good to me!"</font>'
+				'<font color=#<<$Oleg[''font'']>>>"hmmmm"</font>'
 				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 			act 'I won''t leave my children':
 				cla
-				pavIntroStep = 0
+				shared_apt['pavIntroStep'] = 0
 				'<font color=#<<$pcs_font>>>"OK, I will make do with my current accommodation.'
-				'<font color=#<<$yakov_font>>>"We understand"</font>'
-				'<font color=#<<$nestor_font>>>"Damn"</font>'
-				'<font color=#<<$oleg_font>>>"No problem <<$pcs_firstname>>"</font>'
+				'<font color=#<<$Yakov[''font'']>>>"We understand"</font>'
+				'<font color=#<<$Nestor[''font'']>>>"Damn"</font>'
+				'<font color=#<<$Oleg[''font'']>>>"No problem <<$pcs_firstname>>"</font>'
 				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
 			'<font color=#<<$pcs_font>>>OK, I understand.</font>'
-			act 'Thank them and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
+			act 'Thank them and leave':shared_apt['pavIntroStep'] = 0 & gt 'pav_complex', 'start'
 		end
 	end
 end
@@ -468,38 +464,37 @@ if $ARGS[0] = 'list':
 	menu_off = 1
 	$loc_arg = 'list'
 	minut += 2
-	$goBack = $loc_arg
 	'<center><h3><<$pcs_firstname>>''s pricelist</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/list.jpg"></center>'
 	''
-	'The basic weekly rent is <<rentWeekly>> rubles.'
+	'The basic weekly rent is <<shared_apt[''rentWeekly'']>> rubles.'
 	'It is possible to pay it in cash or offer services instead. The prices are following:'
 	''
-	'---------------'
+	'---------------------'
 	''
-	'Cook a warm meal: '+price_cook
-	'Clean the apartment: '+price_clean
-	if servitudeLvl >= 2:
+	'Cook a warm meal: '   +shared_apt['price_cook']
+	'Clean the apartment: '+shared_apt['price_clean']
+	if shared_apt['servitudeLvl'] >= 2:
 		''
-		'---------------'
+		'---------------------'
 		''
 		'Written in marker on the paper, are sexual favours you can offer as well.'
 		''
-		'---------------'
+		'---------------------'
 		'Rent discounts for the slut: '
-		'Handjob: '+price_handjob
-		'Blowjob: '+price_blowjob
-		'Sex: '+price_vaginal
-		'Anal sex: '+price_anal
-		'Special treats: '+price_special
+		'Handjob: '		  +shared_apt['price_handjob']
+		'Blowjob: '		  +shared_apt['price_blowjob']
+		'Sex: '			  +shared_apt['price_vaginal']
+		'Anal sex: '	  +shared_apt['price_anal']
+		'Special treats: '+shared_apt['price_special']
 	end
 	''
-	'---------------'
+	'---------------------'
 	''
 	'Not having paid the full weekly rent at the beginning of a new week will lead to termination of the accommodation services.'
-	'Signed: <a href="exec: gt ''pav_shared_oleg'', ''oleg_Dick''"><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''nestor_Dick''"><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''yakov_Dick''"><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>></font></a>, <<$pcs_firstname>>.'
+	'Signed: <a href="exec: gt ''pav_shared_oleg'', ''Oleg_Dick''"><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''Nestor_Dick''"><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''Yakov_Dick''"><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>></font></a>, <<$pcs_firstname>>.'
 	''
-	'---------------'
+	'---------------------'
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
@@ -599,12 +594,11 @@ if $ARGS[0] = 'cookForGuys':
 	$loc = 'pav_shared_apt'
 	$loc_arg = 'kitchen'
 	minut += 90
-	kuhdrova = 0
 	pcs_mood -= 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'You prepare three meals, using what you can from the guys'' food. It''s not very healthy but you''re not planning to offer to do their shopping too.'
-	price = price_cook
+	shared_apt['price'] = shared_apt['price_cook']
 
 	act 'Leave the meal':gt 'pav_shared_apt', 'payService'
 end
@@ -619,11 +613,11 @@ if $ARGS[0] = 'cleanForGuys':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
 
-	price = price_clean
+	shared_apt['price'] = shared_apt['price_clean']
 	*nl
 	'You collect piles of dirty clothes around the room, carry them into the bathroom, put them in a basin and then pour washing powder on them. You wash them until they are finally clean.'
 	cumStainCh =  rand(0, 100)
-	if servitudeLvl = 2 and cumStainCh <= 50:'<i>You notice bedsheets with what seems as dried out cum. Probably remainder of one of your "servings". Maybe it really is better to swallow every time...</i>'
+	if shared_apt['servitudeLvl'] = 2 and cumStainCh <= 50:'<i>You notice bedsheets with what seems as dried out cum. Probably remainder of one of your "servings". Maybe it really is better to swallow every time...</i>'
 
 	act 'Hang them to dry out and leave':gt 'pav_shared_apt', 'payService'
 end
@@ -656,8 +650,8 @@ if $ARGS[0] = 'pcsRoom':
 	if mc_inventory['tech_tv'] >= 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	'There is an wall unit at the other side of the room, <<$TV>>. Everyone in the household spends their time in their own rooms, so there was never a reason to use the living room for its intended purpose.'
 	*nl
-	if stol = 0:$stol = 'an old scratched <a href="exec:gt ''stol'', ''start''">table</a>'
-	'In the corner there is <<$stol>>.'
+	''
+	'In the corner is an old scratched <a href="exec:gt ''stol'', ''start''">table</a>.'
 	*nl
 	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/home/bedroom/curtain.jpg''">curtain</a> covering entry to the room, which gives you a modicum of privacy; not much better than the state of the non-existent window curtains.'
 
@@ -674,12 +668,12 @@ if $ARGS[0] = 'pcsRoom':
 	if mc_inventory['tech_computer'] = 1:
 		!! Sveta can''t do camshows unless she is blowing the guys for rent.
 		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
-		if servitudeLvl = 2: access['nocamshow'] = 0
+		if shared_apt['servitudeLvl'] = 2: access['nocamshow'] = 0
 		'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">computer</a> is sitting on small table.'
 	end
 
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+	if mc_inventory['card']  > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 
 	if mc_inventory['cocaine'] > 0:'You have <<mc_inventory[''cocaine'']>> doses of Pale Lady, hidden from the other housemates.'
 
@@ -696,39 +690,18 @@ if $ARGS[0] = 'pcsRoom':
 		end
 	end
 
-	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if mc_inventory['tapestry']>0:'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] > 0:'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
-	if pcs_sewng >= 80:
+	if pcs_sewng >= 80 and mc_inventory['sewing_kit'] = 1:
+		*nl
 		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
-			act'Start a new tapestry':
-				cls
-				mc_inventory['sewing_fabric'] -= 1
-				newgobelen = 1
-				minut += 15
-				gs'stat'
-				'You spend 15 minutes working on the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
-			end
+			 act'Start a new tapestry':gt 'sewing', 'tapestry'
 		end
+
 		if newgobelen>=1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry for an hour':
-				cls
-				minut+=60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen += 1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
-			end
+			act 'Work on the tapestry':gt 'sewing', 'tapestry'
 		end
 	end
 
@@ -744,7 +717,7 @@ if $ARGS[0] = 'pcsRoom':
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored on a shelf.'
 	end
 
-	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
+	if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry with you is 30.'
 
 	dynamic $wearpan
 	dynamic $removepan
@@ -785,35 +758,36 @@ if $ARGS[0] = 'sofabed':
 	act 'Get up':gt 'pav_shared_apt', 'pcsRoom'
 end
 
-if $ARGS[0] = 'oleg_Room':
+if $ARGS[0] = 'Oleg_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'oleg_Room'
+	$menu_arg = 'Oleg_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'oleg_Room'
+	$loc_arg = 'Oleg_Room'
+	gs 'boyStat', 'A266'
 	minut += 2
-	'<center><h3><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/room.jpg"></center>'
 	''
 	'The room isn''t as messy as one might expect, given that <<$npc_firstname[''A266'']>> is an IT guy.'
 	'There is one large window with a bed below it, but the entire room is dominated by a large table with several computers and monitors.'
 	'At first glance, one might mistake this room for a hacker''s den.'
 	
-	if hour >= oleg_sleeps and hour < oleg_wakes:
+	if hour >= Oleg['sleeps'] and hour < Oleg['comes']:
 		'<<$npc_firstname[''A266'']>> is sound asleep in his bed.'
-	elseif hour >= oleg_wakes and hour < oleg_leaves:
+	elseif hour >= Oleg['wakes'] and hour < Oleg['leaves']:
 		'<<$npc_firstname[''A266'']>> is already awake and getting ready to leave.'
-		act 'Approach him': gt 'pav_shared_oleg', 'oleg'
-	elseif hour >= oleg_leaves and hour < oleg_comes:
+		act 'Approach him': gt 'pav_shared_oleg', 'Oleg'
+	elseif hour >= Oleg['leaves'] and hour < Oleg['comes']:
 		'<<$npc_firstname[''A266'']>> is currently not here.'
-	elseif hour >= oleg_comes and hour < oleg_sleeps:
+	elseif hour >= Oleg['comes'] and hour < Oleg['sleeps']:
 		'<<$npc_firstname[''A266'']>> is behind his desk, engrossed in programming using an esoteric language.'
-		act 'Approach him': gt 'pav_shared_oleg', 'oleg'
+		act 'Approach him': gt 'pav_shared_oleg', 'Oleg'
 	end
 	
-	if servitudeLvl >= 1 and oleg_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Oleg['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':oleg_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Oleg['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -821,32 +795,33 @@ if $ARGS[0] = 'oleg_Room':
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
-if $ARGS[0] = 'nestor_Room':
+if $ARGS[0] = 'Nestor_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'nestor_Room'
+	$menu_arg = 'Nestor_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'nestor_Room'
+	$loc_arg = 'Nestor_Room'
+	gs 'boyStat', 'A265'
 	minut += 2
-	'<center><h3><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/room.jpg"></center>'
 	''
 	'This room is a messy disaster, with clothes scattered all over the floor.'
 
-	if hour >= nestor_wakes and hour < nestor_leaves:
+	if hour >= Nestor['wakes'] and hour < Nestor['leaves']:
 		'<<$npc_firstname[''A265'']>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pav_shared_nestor', 'nestor'
-	elseif hour >= nestor_leaves and hour < nestor_comes:
+		act 'Approach him': gt 'pav_shared_nestor', 'Nestor'
+	elseif hour >= Nestor['leaves'] and hour < Nestor['comes']:
 		'<<$npc_firstname[''A265'']>> is not here.'
-	elseif hour >= nestor_comes and hour < nestor_sleeps:
+	elseif hour >= Nestor['comes'] and hour < Nestor['sleeps']:
 		'<<$npc_firstname[''A265'']>> is currently on his bed, listing through some magazines.'
-		act 'Approach him': gt 'pav_shared_nestor', 'nestor'
-	elseif hour >= nestor_sleeps or hour < nestor_wakes:
+		act 'Approach him': gt 'pav_shared_nestor', 'Nestor'
+	elseif hour >= Nestor['sleeps'] or hour < Nestor['wakes']:
 		'<<$npc_firstname[''A265'']>> is sleeping in his bed.'
 	end
-	if servitudeLvl >= 1 and nestor_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Nestor['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':nestor_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Nestor['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -854,34 +829,35 @@ if $ARGS[0] = 'nestor_Room':
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
-if $ARGS[0] = 'yakov_Room':
+if $ARGS[0] = 'Yakov_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'yakov_Room'
+	$menu_arg = 'Yakov_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'yakov_Room'
+	$loc_arg = 'Yakov_Room'
+	gs 'boyStat', 'A264'
 	minut += 2
-	'<center><h3><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/room.jpg"></center>'
 	''
 	'This room is very neat and organized, filled with sporting gear such as dresses, equipment, and trophies. The walls are adorned with several posters of famous athletes and sports teams.'
 
-	if hour >= yakov_wakes and hour < yakov_leaves:
+	if hour >= Yakov['wakes'] and hour < Yakov['leaves']:
 		'<<$npc_firstname[''A264'']>> is already awake, packing his gym bags to leave.'
-		act 'Approach him': gt 'pav_shared_yakov', 'yakov'
-	elseif hour >= yakov_leaves and hour < yakov_comes:
+		act 'Approach him': gt 'pav_shared_yakov', 'Yakov'
+	elseif hour >= Yakov['leaves'] and hour < Yakov['comes']:
 		'<<$npc_firstname[''A264'']>> is not here.'
-	elseif hour >= yakov_comes and hour < yakov_sleeps:
+	elseif hour >= Yakov['comes'] and hour < Yakov['sleeps']:
 		doesStuff = rand(0, 100)
 		if doesStuff < 50:'<<$npc_firstname[''A264'']>> is currently on his bed, listing through football magazines.'
 		if doesStuff >= 50:'<<$npc_firstname[''A264'']>> is working out on the floor.'
-		act 'Approach him': gt 'pav_shared_yakov', 'yakov'
-	elseif hour >= yakov_sleeps or hour < yakov_wakes:
+		act 'Approach him': gt 'pav_shared_yakov', 'Yakov'
+	elseif hour >= Yakov['sleeps'] or hour < Yakov['wakes']:
 		'<<$npc_firstname[''A264'']>> is sleeping in his bed.'
 	end
-	if servitudeLvl >= 1 and yakov_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Yakov['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':yakov_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Yakov['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -891,13 +867,13 @@ end
 
 if $ARGS[0] = 'eoleg_agreement':
 	menu_off = 1
-	'<center><img border="5" bordercolor="<<$yakov_font>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
+	'<center><img border="5" bordercolor="<<$Yakov[''font'']>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 
 	'You gather the guys around and explain to them that you wish to move out.'
-	'<font color=#<<$pcs_font>>><<$npc_firstname[''A264'']>> Looks disappointed as he addresses you. "That is a shame <<$pcs_firstname>> we''ve very much enjoyed having you stay here we us. Are you sure this is what you want?"</font>'
+	'<font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>> Looks disappointed as he addresses you. "That is a shame <<$pcs_firstname>> we''ve very much enjoyed having you stay here with us. Are you sure this is what you want?"</font>'
 	act '"Yes." End agreement':
-		pavSharedAptEnabled = 0
+		shared_apt['enabled'] = 0
 		gs 'homes_properties', 'block_access', 'shared_apartment', 0
 		gt 'pav_complex', 'start'
 	end

locations/pav_train_hall.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = '':
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 	
-		if tovarL > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
+		if mc_inventory['trinkets_home'] > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 	end
 
 	act 'Wait':gs 'obj_din', 'wait'

locations/pav_train_hall_events.qsrc

@@ -647,11 +647,11 @@ if $ARGS[0] = 'trinkets':
 
 	tovarand = rand(minimumtov, prodskill / 10)
 
-	if tovarand > tovarL:tovarand = tovarL
+	if tovarand > mc_inventory['trinkets_home']:tovarand = mc_inventory['trinkets_home']
 
 	tovpay = tovarand * 300
 	money += tovpay
-	tovarL -= tovarand
+	mc_inventory['trinkets_home'] -= tovarand
 	gs 'exp_gain', 'sprt', rand(0, 1)
 	TorgVokzalTimes += 1
 	gs 'stat'
@@ -722,7 +722,7 @@ if $ARGS[0] = 'trinkets':
 		act 'Admit you have no permit':
 			*clr & cla
 			money = 0
-			tovarL = 0
+			mc_inventory['trinkets_home'] = 0
 			minut += 120
 			pcs_mood = 5
 			gs'stat'

locations/pav_train_market.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if gobelen > 0 and gobQW = 0:
+		if mc_inventory['tapestry'] > 0 and gobQW = 0:
 			act'Sell tapestry':
 				menu_off = 1
 				*clr & cla
@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went, and he should be easy to find.'
 				act 'Leave':gt 'pav_train_market', 'start'
 			end
-		elseif gobelen > 0 and gobQW >= 1:
+		elseif mc_inventory['tapestry'] > 0 and gobQW >= 1:
 			act'Sell tapestry':
 				menu_off = 1
 				*clr & cla
@@ -98,18 +98,18 @@ if $ARGS[0] = 'start':
 				act 'Leave':gt 'pav_train_market', 'start'
 				act'Show your tapestry':
 					*clr & cla
-					gobelen -= 1
+					mc_inventory['tapestry'] -= 1
 					money += 1000
 					gs'stat'
 					'You show your tapestry to Roman, and he gives you 1000 <b>₽</b>. You take the money and give him the tapestry.'
 					act 'Leave':gt 'pav_train_market', 'start'
 				end
-				if gobelen > 1:
+				if mc_inventory['tapestry'] > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						'You show Roman your tapestries, and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
-						money += gobelen * 1000
-						gobelen = 0
+						'You show Roman your tapestries, and he gives you <<mc_inventory['tapestry'] * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						money += mc_inventory['tapestry'] * 1000
+						mc_inventory['tapestry'] = 0
 						gs'stat'
 						act 'Leave':gt 'pav_train_market', 'start'
 					end
@@ -413,7 +413,7 @@ if ARGS[0] = 4:
 			*clr & cla
 			minut += 5
 			money -= 699
-			card = 2
+			mc_inventory['card'] = 2
 			TimesBuyPorno += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'

locations/pod_ezd.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'etaj_1' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/podezd2.jpg"></center>'
 	'<center>A dirty and poorly maintained stairwell, the same as any other in your town.</center>'
 
-	if seenAd = 0: gt 'pav_shared_apt', 'advertNo30'
+	if shared_apt['seenAd'] = 0: gt 'pav_shared_apt', 'advertNo30'
 
 	'There''s a <a href="exec: gt ''pod_ezd'', ''occupants''">list</a> of the people who live here on the wall.'
 	'Someone put up some <a href="exec:gt ''pod_ezd'',''pod_objava''">advertisements</a> on the wall, near the entrance.'

locations/saveupdater.qsrc

@@ -2663,10 +2663,99 @@ if temp_current_save_version < 00090203:
 	if x < 3: jump 'rstloop'
 	killvar 'i' & killvar 'x'
 end
-
+	
 !!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
 
 if temp_current_save_version < 00090204:
+
+	if oleg_hj						 > 0:			Oleg['hj']						= oleg_hj						&killvar 'oleg_hj'
+	if oleg_bj						 > 0:			Oleg['bj']						= oleg_bj						&killvar 'oleg_bj'
+	if oleg_bjFail				  	 > 0:			Oleg['bjFail']					= oleg_bjFail					&killvar 'oleg_bjFail'
+	if oleg_bjDeep				  	 > 0:			Oleg['bjDeep']					= oleg_bjDeep					&killvar 'oleg_bjDeep'
+	if oleg_bjFailPuke			 	 > 0:			Oleg['bjFailPuke']				= oleg_bjFailPuke			  	&killvar 'oleg_bjFailPuke'
+	if oleg_bjFailFaint				 > 0:			Oleg['bjFailFaint']				= oleg_bjFailFaint			 	&killvar 'oleg_bjFailFaint'
+	if oleg_swall					 > 0:			Oleg['swall']					= oleg_swall					&killvar 'oleg_swall'
+	if oleg_vagCumInsideUnwanted	 > 0:			Oleg['vagCumInsideUnwanted']	= oleg_vagCumInsideUnwanted 	&killvar 'oleg_vagCumInsideUnwanted'
+	if oleg_vag					  	 > 0:			Oleg['vag']						= oleg_vag						&killvar 'oleg_vag'
+	if oleg_vagCumInside		  	 > 0:			Oleg['vagCumInside']			= oleg_vagCumInside				&killvar 'oleg_vagCumInside'
+	if oleg_anal					 > 0:			Oleg['anal']					= oleg_anal					  	&killvar 'oleg_anal'
+	if oleg_analCumInside		 	 > 0:			Oleg['analCumInside']			= oleg_analCumInside		  	&killvar 'oleg_analCumInside'
+	if oleg_vagCumInsideUnwanted	 > 0:			Oleg['vagCumInsideUnwanted']	= oleg_vagCumInsideUnwanted 	&killvar 'oleg_vagCumInsideUnwanted'
+	if oleg_piss					 > 0:			Oleg['piss']					= oleg_piss					  	&killvar 'oleg_piss'
+	if oleg_doPornpos			  	 > 0:			Oleg['doPornpos']				= oleg_doPornpos				&killvar 'oleg_doPornpos'
+	if oleg_pornPos				 	 > 0:			Oleg['pornPos']					= oleg_pornPos				 	&killvar 'oleg_pornPos'
+	if nestor_bj					 > 0:			Nestor['bj']					= nestor_bj						&killvar 'nestor_bj'
+	if nestor_bjFail				 > 0:			Nestor['bjFail']				= nestor_bjFail					&killvar 'nestor_bjFail'
+	if nestor_bjDeep				 > 0:			Nestor['bjDeep']				= nestor_bjDeep					&killvar 'nestor_bjDeep'
+	if nestor_bjFailPuke			 > 0:			Nestor['bjFailPuke']			= nestor_bjFailPuke			  	&killvar 'nestor_bjFailPuke'
+	if nestor_bjFailFaint			 > 0:			Nestor['bjFailFaint']			= nestor_bjFailFaint			&killvar 'nestor_bjFailFaint'
+	if nestor_swall					 > 0:			Nestor['swall']					= nestor_swall					&killvar 'nestor_swall'
+	if nestor_vagCumInsideUnwanted	 > 0:			Nestor['vagCumInsideUnwanted'] 	= nestor_vagCumInsideUnwanted 	&killvar 'nestor_vagCumInsideUnwanted'
+	if nestor_vag					 > 0:			Nestor['vag']					= nestor_vag					&killvar 'nestor_vag'
+	if nestor_vagCumInside		  	 > 0:			Nestor['vagCumInside']			= nestor_vagCumInside			&killvar 'nestor_vagCumInside'
+	if nestor_anal					 > 0:			Nestor['anal']					= nestor_anal					&killvar 'nestor_anal'
+	if nestor_analCumInside		 	 > 0:			Nestor['analCumInside']		  	= nestor_analCumInside		  	&killvar 'nestor_analCumInside'
+	if nestor_vagCumInsideUnwanted	 > 0:			Nestor['vagCumInsideUnwanted']	= nestor_vagCumInsideUnwanted 	&killvar 'nestor_vagCumInsideUnwanted'
+	if nestor_doPornpos			  	 > 0:			Nestor['doPornpos']				= nestor_doPornpos				&killvar 'nestor_doPornpos'
+	if nestor_pornPos				 > 0:			Nestor['pornPos']				= nestor_pornPos				&killvar 'nestor_pornPos'
+	if yakov_bj						 > 0:			Yakov['bj']						= yakov_bj						&killvar 'yakov_bj'
+	if yakov_bjFail				  	 > 0:			Yakov['bjFail']					= yakov_bjFail					&killvar 'yakov_bjFail'
+	if yakov_bjDeep				  	 > 0:			Yakov['bjDeep']					= yakov_bjDeep					&killvar 'yakov_bjDeep'
+	if yakov_bjFailPuke			 	 > 0:			Yakov['bjFailPuke']				= yakov_bjFailPuke			  	&killvar 'yakov_bjFailPuke'
+	if yakov_bjFailFaint			 > 0:			Yakov['bjFailFaint']			= yakov_bjFailFaint			 	&killvar 'yakov_bjFailFaint'
+	if yakov_swall					 > 0:			Yakov['swall']					= yakov_swall					&killvar 'yakov_swall'
+	if yakov_vagCumInsideUnwanted	 > 0:			Yakov['vagCumInsideUnwanted']	= yakov_vagCumInsideUnwanted 	&killvar 'yakov_vagCumInsideUnwanted'
+	if yakov_vag					 > 0:			Yakov['vag']					= yakov_vag						&killvar 'yakov_vag'
+	if yakov_vagCumInside		  	 > 0:			Yakov['vagCumInside']			= yakov_vagCumInside			&killvar 'yakov_vagCumInside'
+	if yakov_anal					 > 0:			Yakov['anal']					= yakov_anal					&killvar 'yakov_anal'
+	if yakov_analCumInside		 	 > 0:			Yakov['analCumInside']			= yakov_analCumInside		  	&killvar 'yakov_analCumInside'
+	if yakov_vagCumInsideUnwanted	 > 0:			Yakov['vagCumInsideUnwanted']	= yakov_vagCumInsideUnwanted 	&killvar 'yakov_vagCumInsideUnwanted'
+	if yakov_doPornpos			  	 > 0:			Yakov['doPornpos']				= yakov_doPornpos				&killvar 'yakov_doPornpos'
+	if yakov_pornPos				 > 0:			Yakov['pornPos']				= yakov_pornPos				  	&killvar 'yakov_pornPos'
+	if yakov_hj						 > 0:			Yakov['hj']						= yakov_hj						&killvar 'yakov_hj'
+	if yakov_dildo					 > 0:			Yakov['dildo']					= yakov_dildo					&killvar'yakov_dildo'
+	if rentLeft						 > 0:		  shared_apt['rentLeft'] 		 	= rentLeft						& killvar 'rentLeft'
+	if weekNum 						 > 0:		  shared_apt['weekNum'] 		 	= weekNum 						& killvar 'weekNum'
+	if rentWeekNum					 > 0:		  shared_apt['rentWeekNum']		 	= rentWeekNum 					& killvar 'rentWeekNum'
+	if servitudeLvl					 > 0:		  shared_apt['servitudeLvl']	 	= servitudeLvl 					& killvar 'servitudeLvl'
+	if servicePaid					 > 0:		  shared_apt['servicePaid']		 	= servicePaid 					& killvar 'servicePaid'
+	if cashPaid			 	 		 > 0:		  shared_apt['cashPaid']		 	= cashPaid 						& killvar 'cashPaid'
+	if pavSharedAptEnabled			 > 0: 		  shared_apt['enabled']			 	= pavSharedAptEnabled 			& killvar 'pavSharedAptEnabled'
+	if pavIntroStep					 > 0:		  shared_apt['pavIntroStep']	 	= pavIntroStep 					& killvar 'pavIntroStep'
+	if rentWeekly					 > 0:		  shared_apt['rentWeekly']		 	= rentWeekly 					& killvar 'rentWeekly'
+	if price						 > 0:		  shared_apt['price']			 	= price 						& killvar 'price'
+	if vcard						 > 0:		  mc_inventory['vintage_card']	 	= vcard 						& killvar 'vcard'
+	if card							 > 0:		  mc_inventory['card']			 	= card 							& killvar 'card'
+	if sexCh						 > 0:		  shared_apt['sexCh']			 	= sexCh 						& killvar 'sexCh'
+	if actionR						 > 0:		  shared_apt['actionR']			 	= actionR 						& killvar 'actionR'
+	if seenAd 						 > 0:		  shared_apt['seenAd']			 	= seenAd 						& killvar 'seenAd'
+	if gobelen						 > 0:		  mc_inventory['tapestry'] 		 	= gobelen 						& killvar 'gobelen'
+	if GarTorgItem					 > 0:		  mc_inventory['trinkets_garage']	= GarTorgItem 					& killvar 'GarTorgItem'
+	if TovarL						 > 0:		  mc_inventory['trinkets_home']  	= TovarL 						& killvar 'TovarL'
+ 	if perenGarTov > 0: killvar 'perenGarTov'
+	if mc_inventory['refill_bottle'] > 0: 		mc_inventory['refill_bottle_water'] = mc_inventory['refill_bottle']	& mc_inventory['refill_bottle'] = 1
+    killvar'kuhdrova'
+	if Oleg['analCumInside']           > 0: Oleg['cumAnal']                  = Oleg['analCumInside']
+	if Oleg['analCumInside']           > 0: Oleg['analCumInside']           -= Oleg['analCumInsideUnwanted']
+	if Oleg['analCumInsideUnwanted']   > 0: Oleg['analCumInsideUnwanted']   -= Oleg['analCumInside']
+	if Nestor['analCumInside']         > 0: Nestor['cumAnal']                = Nestor['analCumInside']
+	if Nestor['analCumInside']         > 0: Nestor['analCumInside']         -= Nestor['analCumInsideUnwanted']
+	if Nestor['analCumInsideUnwanted'] > 0: Nestor['analCumInsideUnwanted'] -= Nestor['analCumInside']
+	if Yakov['analCumInside']          > 0: Yakov['cumAnal']                 = Yakov['analCumInside']
+	if Yakov['analCumInside']          > 0: Yakov['analCumInside']          -= Yakov['analCumInsideUnwanted']
+	if Yakov['analCumInsideUnwanted']  > 0: Yakov['analCumInsideUnwanted']  -= Yakov['analCumInside']
+	if Oleg['vagCumInside']            > 0: Oleg['cumVag']                   = Oleg['vagCumInside']
+	if Oleg['vagCumInside']            > 0: Oleg['vagCumInside']            -= Oleg['vagCumInsideUnwanted']
+	if Oleg['vagCumInsideUnwanted']    > 0: Oleg['vagCumInsideUnwanted']    -= Oleg['vagCumInside']
+	if Nestor['vagCumInside']          > 0: Nestor['cumVag']                 = Nestor['vagCumInside']
+	if Nestor['vagCumInside']          > 0: Nestor['vagCumInside']          -= Nestor['vagCumInsideUnwanted']
+	if Nestor['vagCumInsideUnwanted']  > 0: Nestor['vagCumInsideUnwanted']  -= Nestor['vagCumInside']
+	if Yakov['vagCumInside']           > 0: Yakov['cumVag']                  = Yakov['vagCumInside']
+	if Yakov['vagCumInside']           > 0: Yakov['vagCumInside']           -= Yakov['vagCumInsideUnwanted']
+	if Yakov['vagCumInsideUnwanted']   > 0: Yakov['vagCumInsideUnwanted']   -= Yakov['vagCumInside']
+
+
+
 	!! Drugs variable migration
 	if NarkImmune				> 0:	drugVars['cheat_immune']			= NarkImmune			& killvar 'NarkImmune'
 	if SNarkPriton				> 0:	drugVars['city_drugden']			= SNarkPriton			& killvar 'SNarkPriton'

locations/sewing.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 		act 'Finish':gt 'sewing', 'start'
 		if mc_inventory['sewing_fabric'] < 1:
 			'You do not have any material to sew anything. You should buy some from the supermarket.'
-		elseif tovarL = 30 and (YouCanGar = 0 or GarTorgItem = 100):
+		elseif mc_inventory['trinkets_home'] = 30 and (YouCanGar = 0 or mc_inventory['trinkets_garage'] = 100):
 			'You do not have any further storage space, you need to sell some trinkets to make room before sewing more of them.'
 		else
 			sew_trinket_success = rand(1,240)
@@ -50,20 +50,20 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/pc/activities/sewing/practice.jpg"></center>'
 				'You do your best trying to sew together a trinket at a quality you can sell, but somewhere along the way, you mess it up. The material is ruined, and you''re frustrated as hell, but at least you feel like you learned something.'
 			else
-				if tovarL >= 30 and (YouCanGar = 0 or GarTorgItem >= 100):
+				if mc_inventory['trinkets_home'] >= 30 and (YouCanGar = 0 or mc_inventory['trinkets_garage'] >= 100):
 					'<center><img <<$set_imgh>> src="images/pc/activities/sewing/kit.jpg"></center>'
 					'You put together another trinket but then realize you have too many trinkets already. ' + iif(YouCanGar > 0, 'Even the space in your stepfather''s garage is full. ', '') + 'With a deep sense of regret, you throw it away, having no place to store it. At least you learned more about sewing...'
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activities/sewing/trinket.jpg"></center>'
 					*p 'You spend some time trying to sew something together. After a half hour, you find yourself rewarded for your effort with a small trinket that''s actually of decently high quality. '
-					if tovarL < 30:
-						tovarL += 1
-						'Storing it away, you figure you ' + iif(tovarL < 30, 'still have space for about <<30 - tovarL>>', 'probably don''t have room for any') + ' more of these in your room.' + iif(tovarL >= 30 and YouCanGar > 0, ' If you make any more of these, you''ll need to start storing them in your stepfather''s garage.', '')
+					if mc_inventory['trinkets_home'] < 30:
+						mc_inventory['trinkets_home'] += 1
+						'Storing it away, you figure you ' + iif(mc_inventory['trinkets_home'] < 30, 'still have space for about <<30 - mc_inventory[''trinkets_home'']>>', 'probably don''t have room for any') + ' more of these in your room.' + iif(mc_inventory['trinkets_home'] >= 30 and YouCanGar > 0, ' If you make any more of these, you''ll need to start storing them in your stepfather''s garage.', '')
 						*nl
 						'You wonder if you can sell them somewhere.'
 					else
-						GarTorgItem += 1
-						'The storage space in your room is full, but you can still store it in your stepfather''s garage, ' + iif(GarTorgItem < 100, 'along with probably another <<100 - GarTorgItem>>.', 'though it doesn''t look like there''s space for any more beyond that there either.')
+						mc_inventory['trinkets_garage'] += 1
+						'The storage space in your room is full, but you can still store it in your stepfather''s garage, ' + iif(mc_inventory['trinkets_garage'] < 100, 'along with probably another <<100 - mc_inventory['trinkets_garage']>>.', 'though it doesn''t look like there''s space for any more beyond that there either.')
 						*nl
 						'You wonder how many you can sell at the train station.'
 					end
@@ -72,6 +72,35 @@ if $ARGS[0] = 'start':
 		end
 	end
 end
-			
+if $ARGS[0] = 'tapestry':
+	if newgobelen = 0:
+		*clr & cla
+		menu_off = 1
+		mc_inventory['sewing_fabric'] -= 1
+		newgobelen = 1
+		minut += 15
+		gs 'stat'
+		'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
+
+		act 'Set the tapestry aside': gt $loc, $loc_arg
+	else
+		*clr & cla
+		menu_off = 1
+		minut+=60
+		'<center><img <<$set_imgh>> src="images/pc/activities/sewing/practice.jpg"></center>'
+		gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
+		gobramax = (pcs_sewng - 70) * 6
+		gobramin = (pcs_sewng - 70) * 2
+		newgobelen += rand(gobramin,gobramax)
+		gs 'stat'
+		if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+		if newgobelen >= 1000:
+			killvar 'newgobelen'
+			mc_inventory['tapestry'] += 1
+			'Your work on the tapestry is done.'
+		end
+		act 'Set the tapestry aside': gt $loc, $loc_arg
+	end
+end			
 --- sewing ---------------------------------
 

locations/sitr.qsrc

@@ -42,8 +42,8 @@ if mc_inventory['tech_computer'] = 1:
 	$komp = 'A <a href="exec:gt ''Komp'', ''start''">computer</a> sits on top of it.'
 end
 ! WD: Missing Code to buy / upgrade table, Uninitialised ~ 'stol'
-if stol = 0: $stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
-if stol = 1: $stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
+if mc_inventory['desk'] = 0: $stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
+if mc_inventory['desk'] = 1: $stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
 
 '<<$zal>>. <<$divan>> sits next to the <<$zal2>>. In front of the sofa is <<$TV>>, while <<$stol>> sits in front of the window. <<$komp>>'
 if mishka > 0: iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + 'sitting on a shelf.'

locations/stat_display.qsrc

@@ -1153,13 +1153,13 @@ if cheatStatusIcons = 0:
 	end
 
 	if cheatVars['thirst'] = 0 and $stat_thirst_msg ! '':
-		if mc_inventory['food_water'] = 0 and mc_inventory['refill_bottle'] < 2:
+		if mc_inventory['food_water'] = 0 and mc_inventory['refill_bottle_water'] = 0:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-		elseif mc_inventory['refill_bottle'] > 1 and menu_off = 0:
-			$statusIconBarTab += '<td><a href="exec: mc_inventory[''refill_bottle''] -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+		elseif mc_inventory['refill_bottle_water'] > 0 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec: mc_inventory[''refill_bottle_water''] -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
 		elseif mc_inventory['food_water'] > 0 and menu_off = 0:
 			$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-		elseif (mc_inventory['food_water'] > 0 or mc_inventory['refill_bottle'] > 1) and menu_off = 1:
+		elseif (mc_inventory['food_water'] > 0 or mc_inventory['refill_bottle_water'] > 0) and menu_off = 1:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
 		end
 	end

locations/stol.qsrc

@@ -5,7 +5,11 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	gs 'stat'
 	'<center><h1>Desk</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	'You sit down at your desk.'
 
@@ -183,7 +187,11 @@ if $ARGS[0] = 'strapon':
 !! use gs 'boyStat', 'D<<strapnumber>>' to recall which dildo is attached
 	*clr
 	'<center><h1>Desk</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	if strapnumber = 0: 'Your strapon harness doesn''t have a dildo attached to it.'
 	*nl
@@ -200,7 +208,11 @@ end
 if $ARGS[0] = 'bc':
 	*clr & cla
 	'<center><h1>Desk</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	gs 'stat'
 	gs 'din_bad'