Merge remote-tracking branch 'julzor/master'

locations/FedorEv4.qsrc

@@ -2714,7 +2714,7 @@ if $ARGS[0] = 'Hallway':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/hallway.jpg"></center>'
 	'This is the central hallway which connects the whole house. There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a coat rack and multiple paintings on the walls.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act'<b>Leave the house</b>':
 		if $clothingworntype = 'nude':

locations/HotelRoom.qsrc

@@ -20,7 +20,7 @@ gs 'stat'
 	'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>.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -60,7 +60,7 @@ gs 'stat'
 	'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.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -99,7 +99,7 @@ gs 'stat'
 	'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.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'

locations/MDressing.qsrc

@@ -16,7 +16,7 @@ gs 'stat'
 '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.'
 *nl
-'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'
 act 'Go to east wing hall': gt 'MHall', 'east'

locations/bedr.qsrc

@@ -46,7 +46,7 @@ else
 	'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
 *nl
-'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
 act 'The corridor':gt 'korr'
 

locations/bedrPar.qsrc

@@ -69,7 +69,7 @@ end
 *nl
 'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 *nl
-'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
 if popugai2 = 1:
 	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'

locations/bordel.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'dysh':
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
 	'Your room is so dedicated to it purpose that your clothes are stored in here.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 	
 	act 'Return to your room':gt 'bordel', 'brothel'
 

locations/dachain.qsrc

@@ -26,7 +26,7 @@ if $args[0] = '':
 	*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 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
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 	*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

locations/dom_gor.qsrc

@@ -14,7 +14,7 @@ gs 'themes', 'indoors'
 '<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 choose outfits and organize your clothing), and a small TV.'
 *nl
-'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 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/fit.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'

locations/gdksport.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'

locations/gschool_grounds.qsrc

@@ -713,7 +713,7 @@ if $ARGS[0] = 'change_room':
 	*nl
 	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave so you don''t get stuck here all night.'

locations/leonid.qsrc

@@ -845,7 +845,7 @@ if $ARGS[0] = 'toilet':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/toilet.jpg"></center>'
 	'You are in an office toilet.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if $clothingworntype ! 'office':
 		'<b style="color: #FF00000">You are at work, so you need to be dressed as a secretary!</b>'

locations/mey_home.qsrc

@@ -231,7 +231,7 @@ if $ARGS[0] = '3':
 	'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.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Return to the hallway':
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):

locations/nichBedroomServant.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	gs 'exercise', 'start'
 

locations/obroom.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	'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.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	gs 'exercise', 'start'
 	''

locations/pavSharedApt.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'start':
 		'There are no cupboards in your livingroom 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 ''pavSharedApt'', ''list''">list</a> hangs on the exit door.' & *nl
-		'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 		act 'Go to your room':gt 'pavSharedApt', 'pcsRoom'
 		act 'Go to the bathroom':gt 'pavSharedApt', 'bathroom'
 		act 'Go to the kitchen':gt 'pavSharedApt', 'kitchen'

locations/sauna.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'saunaroom':
 
 	'If you run out of personal hygeine or beauty products, you can ask for some more, but at a cost.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	*nl
 	gs 'saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'

locations/shulgahall.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = '':
 	if home_owned[2] = 0:
 		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes, while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 		*nl
-		'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	else
 		'There are several closets, in the hall</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	end

locations/stwork.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	! Tattoos increase your desireability as a stripper
 	if tatlech > 0:stripKoef1 = rand(1, 3)

locations/tanspalnya.qsrc

@@ -26,7 +26,7 @@ else
 end
 'A luxurious <a href="exec:gt ''divan'', ''start''">leather sofa</a> is also part of the ensemble. Mounted on the wall opposite the sofa is a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>. Under the window, you see a brand-new <a href="exec:gt ''stol'', ''start''">desk</a><<$komp>>'
 *nl
-'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 *nl
 if obruch > 0:'<br>Your hula hoop stands in a corner of the room. '
 if skak > 0:'Your jump rope is sitting on a shelf. '

locations/wardrobe.qsrc

@@ -144,7 +144,15 @@ if $ARGS[0] = 'default':
 	end
 	'</td></tr>'
 	'</table></center>'
-	act 'Return': gt 'wardrobe', 'start'
+	act 'Return':
+		if quick_dress = 1:
+			killvar '$wloc'
+			killvar 'quick_dress'
+			gt $loc, $metka
+		else
+			gt 'wardrobe', 'start'
+		end
+	end
 	act 'Add as a new custom set': gt 'wardrobe', 'default_entry_set', ARRSIZE('defclothingnumber')
 	'<center>Note: Selecting an outfit will show the bonus for equipped shoes, this is only applied when outside.</center>'
 end

locations/ybedr.qsrc

@@ -24,7 +24,7 @@ if ymanrem[4] = 2:
 	'On one side of the bed is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a>.'
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 end
 
 act 'Leave the room':minut += 1 & gt 'ymans'