Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife

QSP1.xml

@@ -1,5 +1,5 @@
 <NotepadPlus>
-    <UserLang name="QSP1" ext="" udlVersion="2.1">
+    <UserLang name="QSP1" ext="qsrc" udlVersion="2.1">
         <Settings>
             <Global caseIgnored="yes" allowFoldOfComments="yes" foldCompact="no" forcePureLC="2" decimalSeparator="2" />
             <Prefix Keywords1="yes" Keywords2="no" Keywords3="no" Keywords4="no" Keywords5="no" Keywords6="no" Keywords7="no" Keywords8="no" />

QSP4.xml

@@ -1,5 +1,5 @@
 <NotepadPlus>
-    <UserLang name="QSP4" ext="" udlVersion="2.1">
+    <UserLang name="QSP4" ext="qsrc" udlVersion="2.1">
         <Settings>
             <Global caseIgnored="yes" allowFoldOfComments="yes" foldCompact="yes" forcePureLC="2" decimalSeparator="2" />
             <Prefix Keywords1="yes" Keywords2="no" Keywords3="no" Keywords4="no" Keywords5="no" Keywords6="no" Keywords7="no" Keywords8="no" />

glife.qproj

@@ -358,7 +358,7 @@
       <Location name="seeporn"/>
       <Location name="brosh"/>
       <Location name="porn_view"/>
-      <Location name="porn_view_strings"/>	  	  
+      <Location name="porn_view_strings"/>
       <Location name="porn_view_construct"/>
     </Folder>
     <Folder name="Reks">
@@ -390,7 +390,7 @@
     <Folder name="Igor Kruglov">
       <Location name="IgorEv"/>
       <Location name="igorhome"/>
-    </Folder>	  
+    </Folder>
     <Folder name="Katja Meynold">
       <Location name="katjaEv"/>
       <Location name="katjaEvDin"/>

locations/FedorEv4.qsrc

@@ -2507,7 +2507,7 @@ if $ARGS[0] =  'Kitchen':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/kitchen.jpg"></center>'
 	''
-	'This kitchen is very clean. Fedor''s parents must be very neat people.' 
+	'This kitchen is very clean. Fedor''s parents must be very neat people.'
 	''
 	'There is a sink, a microwave, a stove and a <a href="exec:gt ''FedorEv4'', ''Fridge''">refrigerator</a> stocked with food.'
 	'If you''re thirsty, you can pour yourself a glass of <a href="exec:gt ''beverage'', ''bev_wat''">water</a> from the tap.'
@@ -2607,7 +2607,7 @@ if $ARGS[0] =  'Bedroom':
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/bedroom.jpg"></center>'
-	'Fedor''s bedroom is very neat, It has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+	'Fedor''s bedroom is very neat, It has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>, where you can choose outfits and organize your clothing.'
 	if FedorLove = 1:
 		'Fedor has a <a href="exec:gt ''FedorEv4'', ''Picture''">framed picture</a> by his bed.'
 	end

locations/Gadhouse.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'Main':
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
-	'A fairly simple cottage in the village of Gadyukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) and a <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can rest. The bed is more comfortable than it looks.'
+	'A fairly simple cottage in the village of Gadyukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''Your body fat is = (<<salo>>)''">scales</a>.'
 

locations/HotelRoom.qsrc

@@ -22,7 +22,7 @@ gs 'stat'
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:GT ''HotelRoom'',''tv''">TV</a>.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -65,7 +65,7 @@ gs 'stat'
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:GT ''HotelRoom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -107,7 +107,7 @@ gs 'stat'
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:GT ''HotelRoom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -164,7 +164,7 @@ $location_type = 'bathroom'
 		shampoo += 1
 		hotshamday = daystart
 	end
-	
+
 
 	gs 'din_van', 'private'
 

locations/MDressing.qsrc

@@ -8,7 +8,7 @@ cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/dressingroom.jpg"></center>'
 'A huge dressing room. Mostly used by submissives to dress as staff and because of this, it is a safe space and games are not allowed.'
-'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>).'
+'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
 'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:GT ''mirror'',''start''">mirrors</a> you can use.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'

locations/_stock_item_info.qsrc

@@ -19,7 +19,11 @@ $item_info['painkiller'] = '<center><b>Painkillers</b></center><br>A pack of pil
 $item_info['tampon'] = '<center><b>Tampons</b></center><br>A pack of cyliner-shape cotton swabs with a string that is capable absorb menstrual fluids during your period.'
 $item_info['sanpad'] = '<center><b>Sanitary napkins</b></center><br>A pack of absorbent towels that provide protection during your period. They attach to the inside of panties to avoid any leakage onto your clothes'
 $item_info['breastpump'] = '<center><b>Breast Pump</b></center><br>A breast pump is a mechanical device that lactating women use to extract milk from their breasts.'
-
+$item_info['fairy'] = '<center><b>Dishwashing detergent</b></center><br>A liquid dishwashing soap with a light almond scent. It claims to cut through grease and grime with ease AND leave your hands feeling soft and moisturized.'
+$item_info['poroshok'] = '<center><b>Clothing detergent</b></center><br>A box of powdered clothing detergent with a light flowery scent that leaves your clothes smelling fresh and clean.'
+$item_info['cltarelka'] = '<center><b>Plates</b></center><br>A set of five plain white dinner plates.'
+$item_info['kosmetica'] = '<center><b>Cosmetics</b></center><br>A complete cosmetic set that covers every part of your makeup routine. There''s enough products in there to allow you to create various looks.'
+$item_info['stanok'] = '<center><b>Razors</b></center><br>Cheap and disposable razors. They''re not meant to last very long, but they get the job done.'
 if $item_info[$ARGS[0]]!'':
 	$RESULT = '<a href="exec: MSG ''<<$item_info[$ARGS[0]]>>''"><img src="images/system/icon/anptekainfo.jpg"></a>'
 else

locations/bedr.qsrc

@@ -35,11 +35,11 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 if rembedr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr.jpg"></center>'
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the door to the corridor, on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in. The windows are closed with faded, heavy curtains.'
+	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
-	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) stands near the door to the corridor. You have a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">chest</a> at the end of your bed where you can store some clothes. At a wall stand a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
 
 if $clothingworntype = 'nude':

locations/bedr2x.qsrc

@@ -26,8 +26,8 @@ else
 end
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
-'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.' 
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
+'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
 if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'
@@ -140,7 +140,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Finish':gt'bedr2x'
 				end
 			end
@@ -164,7 +164,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Finish':gt'bedr2x'
 				end
 			end

locations/bedrPar.qsrc

@@ -65,7 +65,8 @@ end
 ! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 *nl
-'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>. On top of it is a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> that you could use to store clothes that you don''t wear often.'
+'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
+*nl
 'Your <a href="exec:gt ''bed2''">bed</a> is in the corner across from the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
 *nl
 if popugai2 = 1:

locations/clothing.qsrc

@@ -1,8 +1,5 @@
 # clothing
 
-
-
-
 $clothing_list_line = {
 	!! a single line in a clothing list (wardrobe, etc)
 	!! ARGS 0 - action type (wardrobe, sell, resize, store, forsale)
@@ -108,36 +105,42 @@ if $ARGS[0] = 'view_clothing_list':
 	!! ARGS 0 - view_clothing_list
 	!! ARGS 1 - action type (wardrobe, sell, resize, store, unwanted)
 	!! ARGS 2 - Shop name (kats, moncheri, gm, fashionista, sexshop, exhibitshop, dolls, sports)
+	if $ARGS[1] = 'wardrobe':
+		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'
+	elseif $ARGS[1] = 'store':
+		'<h3><center><b><font color="maroon">Stored clothing list</font></b></center></h3>'
+	elseif $ARGS[1] = 'unwanted':
+		'<h3><center><b><font color="maroon">Unwanted clothing list</font></b></center></h3>'
+	end
 
 	if $ARGS[2] = 'gm':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from G&M</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from G&M</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/GM.png"></center>'
 	elseif $ARGS[2] = 'kats':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from PussyKats</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from PussyKats</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
 	elseif $ARGS[2] = 'fashionista':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from Fashionista</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from Fashionista</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/fashionistat.png"></center>'
 	elseif $ARGS[2] = 'moncheri':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from Mon Cheri</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from Mon Cheri</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
 	elseif $ARGS[2] = 'sexshop':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from the sex shop</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from the sex shop</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/sexshop/shop_name.png"></center>'
 	elseif $ARGS[2] = 'exhibitshop':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from the Exhibitionist shop</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from the Exhibitionist shop</font></b></center>'
 		'<center><img src="images/locations/oldtown/exhibitshop/shop_name.png"></center>'
 	elseif $ARGS[2] = 'dolls':
-		'<center><b><font color="maroon">Wardrobe list - Viewing clothes from Patchwork Dolls</font></b></center>'
+		!'<center><b><font color="maroon">Viewing clothes from Patchwork Dolls</font></b></center>'
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 	elseif $ARGS[2] = 'sports':
-		'<center><b><font color="maroon">Wardrobe list - Viewing sportswear from Danilovich</font></b></center>'
+		!'<center><b><font color="maroon">Viewing sportswear from Danilovich</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 	else
-		'<center><b><font color="maroon">Wardrobe list - click on a shop name to view clothes from that shop</font></b></center>'
+		'<center><b><font color="maroon">Click on a shop name to view clothes from that shop</font></b></center>'
 	end
 	*nl
-	*nl
 
 	if $ARGS[1] ! 'sell':
 		$clothing_header = '<center><table border=1>'
@@ -147,14 +150,25 @@ if $ARGS[0] = 'view_clothing_list':
 		$clothing_header += '<TH><a href="exec:gt ''clothing_QV'', ''list''">Switch to icons</a></TH></center>'
 
 		$clothing_header
+		if $ARGS[1] = 'wardrobe':
+			'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		elseif $ARGS[1] = 'store':
+			'<center>These are the clothes you have stored that do not show up in your wardrobe list and cannot be sold at the market.</center><br>'
+		elseif $ARGS[1] = 'unwanted':
+			'<center>These are the clothes you''ve marked to be sold at the market.</center><br>'
+		end
 	end
 
-	if $ARGS[1] = 'wardrobe':
-		cloc = 0
-		if $clothingworntype ! 'nude':act 'Strip':gs 'clothing', 'strip' & gt $loc, $metka
-	end
+	! if $ARGS[1] = 'wardrobe':
+		! cloc = 0
+		! if $clothingworntype ! 'nude':act 'Strip':gs 'clothing', 'strip' & gt $loc, $metka
+	! end
 
-	act 'Leave':gt $loc, $metka
+	if $wloc = 'wardrobe':
+		act 'Return': gt 'wardrobe', 'start'
+	else
+		act 'Leave': gt $loc, $metka
+	end
 
 	if $ARGS[2] = '':
 		'<center><a href="exec:gt ''clothing'', ''view_clothing_list'', ''<<$ARGS[1]>>'', ''gm''"><img src="images/locations/city/citycenter/mall/GM.png"></a></center>'
@@ -183,11 +197,11 @@ if $ARGS[0] = 'view_clothing_list':
 		else
 			'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Bimbo</TH><TH>Prostitute</TH><TH>Actions</TH><TH>Move to</TH>'
 		end
-		
+
 		if $ARGS[1] = 'store':
 			cloc = 1
 		end
-		
+
 		if $ARGS[1] = 'unwanted':
 			cloc = 2
 		end
@@ -342,7 +356,7 @@ if $ARGS[0] = 'view_clothing_item':
 	if CloBimbo = 1:'This item is considered bimbo clothing.'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
-	
+
 	if CloExhibit + 10 > pcs_exhibition and CloExhibit <= pcs_exhibition: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 
 	if $ARGS[2] = 'uniform':
@@ -467,7 +481,7 @@ if $ARGS[0] = 'view_clothing_item':
 					else
 						'This item is too large for you to wear.'
 					end
-				   
+
 					if pcs_sewng >= 60 and tkan > 0:
 						cla
 						'You can resize this thanks to your sewing skill.'
@@ -489,11 +503,11 @@ if $ARGS[0] = 'view_clothing_item':
 		end
 
 		if $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear':
-		
+
 			if CloExhibit > pcs_exhibition:
 				'You don''t feel daring enough to wear an outfit this revealing.'
 			elseif ARRPOS('$CloLosTyp', $ARGS[2]) ! -1 and ARRPOS('CloLosNum',ARGS[3]) ! -1 :
-				'You lost these clothes somewhere, maybe you can find them again?.'				
+				'You lost these clothes somewhere, maybe you can find them again?.'
 			else
 				act 'Wear':
 					gs 'clothing', 'wear', $ARGS[2], ARGS[3]
@@ -571,11 +585,11 @@ if $ARGS[0] = 'strip':
 	else
 		last_vid = 0
 	end
-	
+
 	if $clothingworntype = 'school':schtype = clothingwornnumber
-		
+
 	if $ARGS[1] ! '' :
-		DYNAMIC '$CloLos<<$clothingworntype>>[<<clothingwornnumber>>]=<<$ARGS[1]>>'		
+		DYNAMIC '$CloLos<<$clothingworntype>>[<<clothingwornnumber>>]=<<$ARGS[1]>>'
 		$CloLosLoc[] = $ARGS[1]
 		$CloLosTyp[$ARGS[1]] = $clothingworntype
 		CloLosNum[$ARGS[1]] = clothingwornnumber
@@ -586,7 +600,7 @@ if $ARGS[0] = 'strip':
 		$lastwornclothingtype = $clothingworntype
 		lastwornclothingnumber = clothingwornnumber
 	end
-	
+
 
 	$clothingworntype = 'nude'
 	clothingwornnumber = 0
@@ -634,11 +648,11 @@ if $ARGS[0] = 'recover_lost_clothes':
 	!ARGS[2] = 1 : wear the clothes, ARGS[2] = 2 : Return to shop (lost FOREVAH!)
 	$cloLoc = $ARGS[1]
 	cloAction = ARGS[2]
-	
+
 	$clothType = $CloLosTyp[$cloLoc]
 	clothNumber = CloLosNum[$cloLoc]
 	dayLost = CloLosDay[$cloLoc]
-		
+
 	DYNAMIC 'KILLVAR ''$CloLos<<$clothingworntype>>'', <<clothingwornnumber>>'
 	findLocInd = ARRPOS('$CloLosTyp', $clothType)
 	KILLVAR '$CloLosTyp', findLocInd
@@ -649,13 +663,13 @@ if $ARGS[0] = 'recover_lost_clothes':
 	findLocInd = ARRPOS('$CloLosLoc', $cloLoc)
 	KILLVAR '$CloLosLoc', findLocationIndex
 	KILLVAR 'findLocInd'
-	
+
 	if cloAction = 1:
 		gs 'clothing', 'wear', $clothType, clothNumber
 	elseif cloAction = 2 :
 		dynamic $clothType + 'S[<<clothNumber>>] = 1'
 	end
-	
+
 	KILLVAR '$cloLoc'
 	KILLVAR 'cloAction'
 	KILLVAR '$clothType'

locations/dachain.qsrc

@@ -30,14 +30,14 @@ if $args[0] = '':
 	end
 	'Your favorite summer residence.'
 	*nl
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). You have a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">chest</a> at the end of your bed where you can store some clothes. On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 	*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 hour >= 6 and hour <= 20 and etoexhib = 11:'Kopashatsya working in the garden, hmm ... maybe sometime <a href="exec:gt ''etoexhib'', ''pos10''">motivate</a> for them to work quicker and smarter.'
 	if hour >= 6 and hour <= 20 and etoexhib = 12:'Leave in <a href="exec:gt ''etoexhib'', ''pos11''">garden in lingerie and robe.</a>'
 	if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! daystart:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'
-	
+
 	act 'Lie on the couch': gt 'divan', 'start'
 	act 'Goto the kitchen alcove': gt 'dachain', 'dachakit'
 	act 'Goto the Bathroom':  gt 'dachain', 'dachavann'
@@ -107,7 +107,7 @@ if $args[0] = 'dachakit':
 	dynamic $driwater
 	dynamic $lekarstvo
 	dynamic $vitamin
-	
+
 	act 'Go into the main room': gt 'dachain', ''
 	act 'Goto the Bathroom':  gt 'dachain', 'dachavann'
 end

locations/dom_gor.qsrc

@@ -18,7 +18,7 @@ else
 end
 '<center><b><font color="maroon">Your room</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
-'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) and a small TV.'
+'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
 
 if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Go for a jog around the park (1:00)':

locations/mey_home.qsrc

@@ -43,8 +43,8 @@ if $args[0] = 'door':
 			'You walk up to the Meynolds residence and ring the doorbell...'
 			'Katja opens the door and quickly drags you to her room.'
 
-			act 'Go to Katjas room': 
-				if frost > 0: frost = 0 
+			act 'Go to Katjas room':
+				if frost > 0: frost = 0
 				gt 'KatjaHomeTalk'
 			end
 			exit
@@ -89,19 +89,19 @@ if $ARGS[0] = 'start':
 
 			exit
 		end
-		
+
 		! need to fuck Katja!
 		if KatjaSex >= 5 and mey_vika['mey_vika_qw'] > 35 and hour = 23 and mey_vika['mey_vika_bang_qw'] = 0:
 			gs 'mey_vika_events', 'bang_katya'
 			exit
 		end
-		
+
 		! Vic calls in the shower
 		if mesec = 0 and pcs_vag > 0 and mey_vika['bath_qw'] = 1 and mey_vika['bath_qw_day'] ! daystart and rand(0,10) > 5 and ((week < 6 and hour >= 14) or (week = 6 and hour >= 8)):
 			gs 'mey_vika_events', 'bath_qw1'
 			exit
 		end
-		
+
 		if ((week < 6 and hour >= 14 and hour < 20) or (week = 6 and hour >= 10 and hour < 20)) and mey_tamara['help_day'] ! daystart:
 			act 'Clean the house':
 				cla
@@ -130,7 +130,7 @@ if $ARGS[0] = 'start':
 	act 'Tamara Mikhailovna''s room': gt 'mey_home', '7'
 	act 'Garden': gt 'mey_home', '8'
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check	
+	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 ! kitchen
@@ -142,7 +142,7 @@ if $ARGS[0] = '1':
 	'<center><h4><font color="maroon">Kitchen</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/kitchen.jpg"></center>'
 	'The kitchen is huge and luxurious. It is decorated in a minimalist high-tech style. An oval dining room table standing in the middle of the room. The appliances are all hidden. The kitchen is sparkling clean.'
-	
+
 	act 'Return to hallway': gt 'mey_home', 'start'
 
 	if mey_vika['mey_vika_qw'] >= 32 and ((week < 6 and hour >= 14 and hour < 20) or (week = 6 and hour >= 10 and hour < 20)) and mey_tamara['help_day'] ! daystart:
@@ -163,7 +163,7 @@ if $ARGS[0] = '1':
 	act 'Eat a light meal (0:20)':gs 'food', 's_meal'
 
 	act 'Have a snack (0:05)':gs 'food', 'snack'
-	
+
 	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
 
 	act 'Have a cup of tea (0:05)':
@@ -284,7 +284,7 @@ if $ARGS[0] = '1':
 	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
-if $ARGS[0] = '2': 
+if $ARGS[0] = '2':
 	!bathroom
 	$locM = 'mey_home'
 	$metkaM = '2'
@@ -292,10 +292,10 @@ if $ARGS[0] = '2':
 	minut += 1
 	cls
 	gs'stat'
-	$location_type = 'bathroom'	
+	$location_type = 'bathroom'
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
-	'A luxurious bathroom looking like the five-star hotel bathrooms you read about in the magazines.'	
+	'A luxurious bathroom looking like the five-star hotel bathrooms you read about in the magazines.'
 	'Above the beautiful vanity and sink there is a huge <a href="exec:GT ''mirror'',''start''">mirror</a>.'
 	!acts copy from [shulgabath]
 	act 'Return to the hallway': gt 'mey_home', 'start'
@@ -313,7 +313,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
-	'It feels and looks like a standard room in a hotel. There is a <a href="exec:gt ''bed'', ''start''">bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) and a desk.'
+	'It feels and looks like a standard room in a hotel. There is a <a href="exec:gt ''bed'', ''start''">bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) and a desk.'
 	'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
 	if komp = 1:'Your <a href="exec:GT ''Komp'',''start''">laptop</a> is on the desk.'
 
@@ -332,11 +332,11 @@ if $ARGS[0] = '3':
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
 	if pornMagazine > 0:
 		'You hide your porn magazines under the mattress of your bed.'
-		gs 'events', 'read_porn'	
+		gs 'events', 'read_porn'
 	end
-	
+
 	gs 'events', 'read'
-	
+
 	if dur > 0 and narkday ! daystart:
 		act 'Snort the White Lady (0:05)':
 			cla
@@ -367,7 +367,7 @@ if $ARGS[0] = '3':
 			gt 'mey_home', '3'
 		end
 	end
-	
+
 	act 'Wait':
 		cla
 		waiting = input ("How long would you like to wait? (Not more than 120 minutes)")
@@ -381,7 +381,7 @@ if $ARGS[0] = '3':
 		act 'Take a look at the clock':gt 'mey_home', '3'
 	end
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check	
+	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 if $ARGS[0] = '4':

locations/obroom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
 	'This is your room which you share with another girl named Vika Zhurova.'
-	'At the right of the entrance you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>), on top of the wardrobe there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase,</a> in which you can store some clothes in.'
+	'At the right of the entrance you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a <a href="exec:GT ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:GT ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
 	if komp = 1:'There''s a <a href="exec:GT ''Komp'',''start''">laptop</a> laying on your bed.'

locations/pavSharedApt.qsrc

@@ -271,7 +271,7 @@ if $ARGS[0] = 'start':
 		'From the hallway several doors lead to <a href="exec:gt ''pavSharedApt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pavSharedApt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pavSharedApt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
 		'The last doors lead to the <a href="exec:gt ''pavSharedApt'', ''pcsRoom''">room</a> you have rented.'
 		''
-		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">store your clothes</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
+		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to store your clothes</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 		''
 		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pavSharedApt'', ''list''">list</a> hangs on the exit door.'
 		act 'Living room (your room)':gt 'pavSharedApt', 'pcsRoom'
@@ -836,7 +836,7 @@ if $ARGS[0] = 'pcsRoom':
 	if 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.'
 	''
-	'On the other side of the sofa bed are your old <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcases</a>, which you could use to store the clothes you don''t often wear.'
+	'On the other side of the sofa bed are your old <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">suitcases</a>, which you could use to store the clothes you don''t often wear.'
 	''
 	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/sharedapt/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-existant window curtains'
 

locations/rinok.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	$loc = 'rinok'
 	'<center><b><font color="maroon">Marketplace</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/market/rinok.jpg"></center>'
-
+	''
 	'On one of the stalls has a sign "Cash paid for secondhand clothes", here you can <a href="exec:cloc=2 & gt ''clothing'', ''view_clothing_list'', ''sell''">sell individual items</a> or <a href="exec:gs ''portnoi''">all of your unwanted clothes</a>.'
 
 	if $message ! '':
@@ -29,8 +29,8 @@ if $ARGS[0] = 'start' or $metka = 'start':
 		killvar '$message'
 	else
 		''
-	end	
-	*pl '<center><table align="center" width=80%>' 
+	end
+	*pl '<center><table align="center" width=80%>'
 	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'rinok')
 	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'rinok')
 	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'rinok')
@@ -48,10 +48,10 @@ if $ARGS[0] = 'start' or $metka = 'start':
 			pcs_mood -= 5
 			exhibition_exp += 2
 			'You feel someones hand gently touch <a href="exec:gt ''etoexhib'', ''pos15''">your butt</a>.'
-			
+
 			gs 'arousal', 'foreplay', 3
 			gs 'stat'
-			
+
 		end
 	end
 
@@ -136,7 +136,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 				act 'Leave':gt'rinok','start'
 			end
 		end
-		
+
 		if money >= 350:
 			act 'Buy a book of science fiction 350r':
 				cls
@@ -212,7 +212,7 @@ end
 
 if $ARGS[0] = 'marketclo':
 	cla
-	
+
 	if cheap[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'rinok', 'clo'

locations/sauna.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'saunaroom':
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
 
-	'<br>The room has a thread bare <a href="exec:sec += 30 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>).'
+	'<br>The room has a thread bare <a href="exec:sec += 30 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
 

locations/tanspalnya.qsrc

@@ -13,7 +13,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/characters/city/nicholas/spaln.jpg"></center>'
 
 'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
+'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 if komp = 1:
 	$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 else
@@ -80,7 +80,7 @@ if sick >= 1:
 
 		'You lie in bed, coughing, sneezing, blowing your nose... and, as if that wasn''t enough, you also think you might be getting a headache.'
 		'Drifting in and out of sleep, you spend about 4 hours tossing and turning, trying to sweat out the illness, and you actually feel better when you decide to stretch your legs.'
- 
+
 		act 'Get up': gt 'bedr'
 	end
 end
@@ -152,7 +152,7 @@ if TanMaidRoomClean = 0:
 		gs 'stat'
 		nl
 		''
-		'You vacuum, wet wipe, dust and polish all the surfaces and objects in your room, knowing well that, if a guest wanted to take a look inside, you''d embarrass Nicholas if this room wasn''t in as perfect a condition as is expected of all the others.' 
+		'You vacuum, wet wipe, dust and polish all the surfaces and objects in your room, knowing well that, if a guest wanted to take a look inside, you''d embarrass Nicholas if this room wasn''t in as perfect a condition as is expected of all the others.'
 		'At least you are free to wear whatever you want while you clean your room, you think.'
 		act 'Finish cleaning':
 			gt 'tanspalnya'

locations/wardrobe.qsrc

@@ -1,10 +1,11 @@
 # wardrobe
 
 if $ARGS[0] = 'start':
+	$wloc = 'wardrobe'
 	if ward_img_hgt = 0:ward_img_hgt = 250
 	'<center><B><U>Outfit overview - Click on an item to change it</U></B></center>'
-
-	'<center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
+	'<br><center>These are the clothes you are currently wearing'
+	'<br><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
 	*p '<TH>Bra worn</TH><TH>Outfit worn</TH><TH>Coat (only worn outside when cold)</TH>'
 	*P '<TR><TD><center><a href="exec:gt ''bras'', ''view_bra_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''bra'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
 	if defaultcoat = 0:
@@ -13,7 +14,6 @@ if $ARGS[0] = 'start':
 		'<a href="exec:gt ''cloakroom'', ''view_coat_list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'', ''coat'')>>"></a>'
 	end
 	'</center></TD>'
-
 	'<TR><TD><center>'
 	if $braworntype ! 'none':
 		'<a href="exec:gs ''bras'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
@@ -42,7 +42,6 @@ if $ARGS[0] = 'start':
 		'<a href="exec:gt ''purses'', ''view_purse_list''"><img Height = <<ward_img_hgt>> src="images/pc/noitem.png"></a>'
 	end
 	'</center></TD>'
-
 	'<TR><TD><center>'
 	if $pantyworntype ! 'none':
 		'<a href="exec:gs ''panties'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
@@ -62,32 +61,30 @@ if $ARGS[0] = 'start':
 		'Remove'
 	end
 	'</center></TD>'
-
+	'<TR><TD><TD><center>'
+	if ($clothingworntype ! 'nude' and (defaultcoat > 0 or bag > 0)) or (defaultcoat > 0 and bag > 0):
+		'<a href="exec:gs ''wardrobe'', ''removeall'' & gt ''wardrobe'', ''start''">Remove all items</a>'
+	else
+		'Remove all items'
+	end
+	'</center></TD>'
 	'</table></center>'
-	act 'Leave': gt $Loc, $Metka
+	act 'Return': killvar '$wloc' & gt $loc, $metka
 
-	act 'Strip all clothes/shoes':
-		gs 'bras', 'remove'
-		gs 'clothing', 'strip'
-		gs 'panties', 'remove'
-		gs 'shoes', 'strip'
-		gt 'wardrobe', 'start'
-	end
-		
-	act 'Remove everything':
+	act 'Strip all clothing':
 		gs 'bras', 'remove'
 		gs 'clothing', 'strip'
-		defaultcoat = 0
 		gs 'panties', 'remove'
 		gs 'shoes', 'strip'
-		gs 'purses', 'remove'
 		gt 'wardrobe', 'start'
 	end
 
-	act 'Set outfit as a default': gt 'wardrobe', 'default_set'
+	act 'Set a default outfit': gt 'wardrobe', 'default_set'
 
 	act 'Choose a default outfit': gt 'wardrobe', 'default'
 
+	act 'View stored clothing': gt 'clothing', 'view_clothing_list', 'store'
+
 	act 'Set image height for this view':
 		cla
 		*clr
@@ -102,6 +99,16 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'removeall':
+		 gs 'bras', 'remove'
+		 gs 'clothing', 'strip'
+		 gs 'panties', 'remove'
+		 gs 'shoes', 'strip'
+		 gs 'purses', 'remove'
+		 defaultcoat = 0
+	end
+ end
+
 !!---------------------------Oufit stuff----------------------------------
 
 if $ARGS[0] = 'default':
@@ -120,7 +127,7 @@ end
 
 if $ARGS[0] = 'default_entry_wear':
 	default_entry = ARGS[1]
-	
+
 	gs 'clothing_attributes', $defclothingtype[default_entry], defclothingnumber[default_entry]
 	gs 'clothing', 'wear', $defclothingtype[default_entry], defclothingnumber[default_entry]
 
@@ -148,9 +155,9 @@ if $ARGS[0] = 'default_entry_wear':
 
 	if dyneval('RESULT = coat[<<defcoat[default_entry]>>]') = 0: defcoat[default_entry] = 0
 	defaultcoat = defcoat[default_entry]
-	
+
 	!! default school girl uniform is always allowed to be worn if still in school
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $defclothingtype[default_entry] = 'school' and defclothingnumber[default_entry] = 6:	
+	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $defclothingtype[default_entry] = 'school' and defclothingnumber[default_entry] = 6:
 		cls
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'

locations/ybedr.qsrc

@@ -15,7 +15,7 @@ if ymanrem[4] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/
 if ymanrem[4] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
 if ymanrem[4] = 2:
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybedr.jpg"></center>'
-	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>. On one of the sides there''s an entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). You have a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">chest</a> at the end of your bed where you can store some clothes.'
+	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>. On one of the sides there''s an entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 end