Merge remote-tracking branch 'Sicaa/master'

locations/anushkaev1.qsrc

@@ -68,7 +68,6 @@ if $ARGS[0] = 'strapon1':
 									gs 'stat'
 									act 'Get fucked':
 										*clr & cla
-										gs 'boyStat', 'D3' 
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme7.jpg"></center>'
 										'Once she gets bored of watching you suck the dildo she flips you back on your back, spreading your legs she kneels between them. She rubs the tip of her dildo against your wet pussy lips till it is nice and wet as well, then slowly slides the <<dick>>cm <<$dick_girth>> dildo inside of you, causing you to moan with pleasure. She slowly and gently fucks you, as you get wetter and wetter.'
 										gs 'arousal', 'vaginal_strap', 5, 'lesbian'
@@ -102,7 +101,6 @@ if $ARGS[0] = 'strapon1':
 											end
 											act 'Let her':
 												*clr & cla
-												gs 'boyStat', 'D3' 
 												'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
 												if analplugin = 1:
 													analplugin = 0

locations/bras.qsrc

@@ -39,6 +39,12 @@ end
 if $ARGS[0] = 'view_bra_list':
 	!! ARGS 0 - view_bra_list
 	!! ARGS 1 - action type (draw, store, unwanted)
+	
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
 
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'

locations/brothel.qsrc

@@ -569,7 +569,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	if stanok > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

locations/butoilet.qsrc

@@ -25,7 +25,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-dynamic $removepan
+dynamic $publicpan
 
 --- butoilet ---------------------------------
 

locations/clothing.qsrc

@@ -105,6 +105,13 @@ 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 $pursepantytype ! '' or $pursebratype ! '' and $ARGS[1] ! 'resize' and $ARGS[1] ! 'sell':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+	
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'

locations/club.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'dance':

locations/dimaHome.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'bathroom2':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

locations/din_bad.qsrc

@@ -221,7 +221,9 @@ if $ARGS[0] = 'd_bag':
 	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0: 'You have <b><<pattest>></b> unused paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
 	if used_pattest > 0: 'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
-
+	*nl
+	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
+	
 	act 'Return':gt 'obj_din', 'menu_exit'
 	'</td></tr></table></center>'
 end

locations/din_van.qsrc

@@ -541,6 +541,77 @@ $removepan = {
 	end
 }
 
+!! Meant for non-home bathrooms. If you have a bag stashes the underwear in there and enables putting it back on later.
+!! purse_____ variables get wiped in 'wardrobe', 'clothing', 'panties' and 'bra' so there isn''t a chance of duplication
+$publicpan = {
+	if $pantyworntype ! 'none' and $braworntype ! 'none':
+		act 'Remove underwear' + iif(bag = 1, ' and put it in your purse','') + ' (0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'underwear', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $braworntype = 'none' and $pursepantytype ! '' and $pursebratype ! '':
+		act 'Put your underwear back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $pantyworntype ! 'none':
+		act 'Remove panties ' + iif(bag = 1, ' and put them in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+			end
+			gs 'panties', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $pursepantytype ! '':
+		act 'Put your panties back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $braworntype ! 'none':
+		act 'Remove bra ' + iif(bag = 1, ' and put it in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'bras', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $braworntype = 'none' and $pursebratype ! '':
+		act 'Put your bra back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+}
+
 $basin = {
 	if cumloc[12] = 1:
 		act 'Rinse your mouth (0:05)':

locations/gdktoilet.qsrc

@@ -405,7 +405,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'mensmast':

locations/gschool_boys_bathroom.qsrc

@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'boy7':
 				act 'Make him take it (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'force'
-					gs 'boyStat', 'd<<dildonumber>>'
+					gs 'boyStat', 'D<<strapnumber>>'
 					gs 'stat'
 					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom3.jpg"></center>'

locations/gschool_break.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'restroom_actions':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end	
 
 if $ARGS[0] = 'girls_restroom_events':
@@ -348,7 +348,6 @@ if $ARGS[0] = 'girls_restroom_events':
 								act 'Continue':
 									*clr & cla
 									gs 'pain', 2, 'vaginal', 'stretch'
-									gs 'boyStat', 'D2' 
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully3.jpg"></center>'
 									'Lera gets frustated at the position, sitting she can''t really pound you. She pulls out and stands up. "Get the slut up so I can pile drive this bitch." The other girls lift your hips in the air, pulling your legs forward so your knees are almost against your shoulders, as they hold your arms and legs in place. Now with a much better vantage point, Lera slides the <<dick>>cm <<$dick_girth>> dildo back inside of your pussy and starts fucking you hard, making comments about how loose you are, while the other girls laugh.'
 									gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -364,7 +363,6 @@ if $ARGS[0] = 'girls_restroom_events':
 											*clr & cla
 											gs 'pain', 3, 'asshole', 'stretch'
 											gs 'pain', 2, 'asscheeks', 'spank'
-											gs 'boyStat', 'D3'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully5.jpg"></center>'
 											'Lera pulls out. After a brief discussion, another girl, one of the younger ones, puts on the harness and lays down. "Come on slut mount me." Not giving a choice the other girls pull you over on top of you and force you down on the <<dick>>cm <<$dick_girth>> dildo, as it slides all the way up in you. A couple of the other girls slap your ass hard, to encourage you to to do the work.'
 											'Lena kneels down behind you, moments later you feel her spit against your asshole, then the pressure of the head of a dildo in her hand. With only that bit of spit for lubrication she shoves the <<dick>>cm <<$dick_girth>> dildo in your ass. A couple of the other girls add their spit to the shaft of the dildo so it slides a little easier.'
@@ -374,7 +372,6 @@ if $ARGS[0] = 'girls_restroom_events':
 											gs 'stat'
 											act 'Continue':
 												*clr & cla
-												gs 'boyStat', 'D3'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully6.jpg"></center>'
 												'Paulina puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass to your relief. "Give me that, if we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass, it feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass, as both dildo''s are hammered into both your holes.'
 												gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -383,7 +380,6 @@ if $ARGS[0] = 'girls_restroom_events':
 												gs 'stat'
 												act 'Continue':
 													*clr & cla
-													gs 'boyStat', 'D3'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully7.jpg"></center>'
 													'The girl on the bottom finally has had enough and pushes you up enough, until the dildo slips out of your pussy. Paulina keeps fucking your ass for a bit, while the other one slides out from under you. Soon the other girls demand a turn, it seems none of them feel like sliding back under you or using your pussy anymore. Instead several more of them, maybe all of them, you can''t tell, take turns wearing a strapon and fucking your ass.'
 													gs 'arousal', 'anal_strap', 10, 'humiliation', 'maso', 'gangbang', 'lesbian'

locations/gschool_chats1.qsrc

@@ -298,7 +298,7 @@ if $ARGS[0] = 'igor_peg':
 				gs 'stat'
 				act 'Bend over bitch boy':
 					*clr & cla
-					gs 'boyStat', 'D2' 
+					gs 'boyStat', 'D<<strapnumber>>' 
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/break5.jpg"></center>'
 					'Once he has the strapon nice and wet with his saliva you tell him. "Get up and bend over for me my little slut."'
 					'He stands up and bends over one of the desks, you step up behind him and rub the tip of your strapon against his little puckered asshole. You bend over a bit and spit in the crack of his ass to add a little more lubrication. Then you press the head of the strapon against his asshole into it pops in, he moans in a mixture of pain and pleasure as it does.'

locations/gschool_grounds.qsrc

@@ -713,7 +713,7 @@ if $ARGS[0] = 'change_room':
 		cla
 		gt 'wardrobe', 'start'
 	end
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash

locations/kafe2.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'givi':

locations/katjaEvDin.qsrc

@@ -179,13 +179,13 @@ if $ARGS[0] = 'dildo':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
-	if katjahorny >= 100:katjahorny = 80
+	if katjahorny >= 100: katjahorny = 80
 	'You get your handbag and pull out the toy.'
-	act'Strap it on':
+	act 'Strap it on':
 		*clr & cla
-		minut+=3
+		minut += 3
 		lesbian += 1
-		gs 'boystat', 'D1', 'b'
+		gs 'boystat', 'D<<strapnumber>>', 'b'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon.jpg"></center>'
 		'You put the strap-on harness on and buckle it in place, Katja bites her lip watching your actions.'

locations/koncepod1.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0]='bdr2x':

locations/laketoilet.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
-		dynamic $removepan
+		dynamic $publicpan
 	end
 end
 

locations/leonid.qsrc

@@ -859,7 +859,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 --- leonid ---------------------------------

locations/nordtrain.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'ticket':

locations/panties.qsrc

@@ -43,6 +43,12 @@ end
 if $ARGS[0] = 'view_panty_list':
 	!! ARGS 0 - view_panty_list
 	!! ARGS 1 - action type (clean, dirty, store, bathroom)
+	
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
 
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'

locations/pavtrainhall.qsrc

@@ -382,7 +382,7 @@ if $ARGS[0] = 'female':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'male':

locations/qwBarPoletToilet.qsrc

@@ -26,7 +26,7 @@ if temp <= 6:
 	'The <a href="exec:gt ''mirror'', ''start''">mirror</a> you see above the sinks has some cracks radiating from one of the corners, but other than that, it''s perfectly usable.'
 	act 'Return to the main room': minut += 1 & gt 'qwBarPolet'
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	dynamic $quickwash
 elseif temp = 7:
 	if pcs_horny < 90: pcs_horny += 10

locations/rolanbath.qsrc

@@ -400,7 +400,7 @@ if $ARGS[0] = 'start':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla

locations/sexshop.qsrc

@@ -845,7 +845,7 @@ if $ARGS[0] = 'toi':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'pip':

locations/soniadisco.qsrc

@@ -1588,8 +1588,7 @@ if $ARGS[0] = 'homesex':
 						if strapon = 1 and soniasex = 1:
 							act 'Show her your strapon':
 								*clr & cla
-								! Since strapnumber currently doesn''t work, I''ll set the size to 15. If strapon size ever gets revamped, change this!
-								gs 'boyStat', 'D15'
+								gs 'boyStat', 'D<<strapnumber>>'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/home/livingroom/strapon/strapon2.jpg"></center>'
 								'As she tries to lead you to her room, you grab her hand and pull her back. She looks at you with questioning eyes, obviously wondering if you have changed you mind. Then her eyes get huge when you pull your strap-on with attached dildo out of your purse and show it to her. "Oh my god." She utters with her hands over her mouth and then sits down on couch.'

locations/stol.qsrc

@@ -28,7 +28,14 @@ if $ARGS[0] = 'start':
 	
 	act 'Check birth control': gt 'stol', 'bc'
 	
-	gs 'stol', 'strapon'
+	killvar '$stol_loc_temp'
+	if strapon = 1:
+		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
+			act 'Check out your strapon harness': $stol_loc_temp = 'start' & gt 'stol', 'strapon'
+		else
+			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
+		end
+	end
 	
 	if siga > 0:
         act 'Hide some cigarettes in your drawer':
@@ -152,7 +159,14 @@ if $ARGS[0] = 'stolPar':
 		act 'Finish all of your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 
-	gs 'stol', 'strapon'
+	killvar '$stol_loc_temp'
+	if strapon = 1:
+		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
+			act 'Check out your strapon harness': $stol_loc_temp = 'stolPar' & gt 'stol', 'strapon'
+		else
+			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
+		end
+	end
 	
 	if siga > 0:
         act 'Hide some cigarettes in your drawer':
@@ -221,44 +235,21 @@ if $ARGS[0] = 'stolPar':
 end
 
 if $ARGS[0] = 'strapon':
-!! use gs 'boyStat', 'D<<strapnumber>>' to recall which dildo is attached?
-	if strapon = 1:
-		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
-			act 'Check out your strapon harness':
-				*clr
-				'<center><h1>Desk</h1></center>'
-				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
-				*nl
-				if strapnumber = 0:
-					'Your strapon harness doesn''t have a dildo attached to it.'
-				elseif strapnumber = 1:
-					'Your 10cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 2:
-					'Your 15cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 3:
-					'Your 20cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 4:
-					'Your 25cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 5:
-					'Your 30cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 6:
-					'Your 35cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 7:
-					'Your 40cm dildo is attached to your strapon harness.'
-				end
-				*nl
-				if dildo = 1: '<a href="exec:strapnumber = 1 & gt ''stol'', ''stolPar''">Attach</a> your 10cm long dildo.'
-				if middildo = 1: '<a href="exec:strapnumber = 2 & gt ''stol'', ''stolPar''">Attach</a> your 15cm long dildo.'
-				if largedildo = 1: '<a href="exec:strapnumber = 3 & gt ''stol'', ''stolPar''">Attach</a> your 20cm long dildo.'
-				if bigdildo = 1: '<a href="exec:strapnumber = 4 & gt ''stol'', ''stolPar''">Attach</a> your 25cm long dildo.'
-				if extradildo = 1: '<a href="exec:strapnumber = 5 & gt ''stol'', ''stolPar''">Attach</a> your 30cm long dildo.'
-				if superdildo = 1: '<a href="exec:strapnumber = 6 & gt ''stol'', ''stolPar''">Attach</a> your 35cm long dildo.'
-				if maddildo = 1: '<a href="exec:strapnumber = 7 & gt ''stol'', ''stolPar''">Attach</a> your 40cm long dildo.'
-			end
-		else
-			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
-		end
-	end
+!! 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>'
+	*nl
+	if strapnumber = 0: 'Your strapon harness doesn''t have a dildo attached to it.'
+	*nl
+	if dildo = 1: iif(strapnumber = 1, 'Your 10cm dildo is attached to your strapon harness.', '<a href="exec:strapnumber = 1 & gt ''stol'', ''strapon''">Attach</a> your 10cm long dildo.')
+	if middildo = 1: iif(strapnumber = 2, 'Your 15cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 2 & gt ''stol'', ''strapon''">Attach</a> your 15cm long dildo.')
+	if largedildo = 1: iif(strapnumber = 3, 'Your 20cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 3 & gt ''stol'', ''strapon''">Attach</a> your 20cm long dildo.')
+	if bigdildo = 1: iif(strapnumber = 4, 'Your 25cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 4 & gt ''stol'', ''strapon''">Attach</a> your 25cm long dildo.')
+	if extradildo = 1: iif(strapnumber = 5, 'Your 30cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 5 & gt ''stol'', ''strapon''">Attach</a> your 30cm long dildo.')
+	if superdildo = 1: iif(strapnumber = 6, 'Your 35cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 6 & gt ''stol'', ''strapon''">Attach</a> your 35cm long dildo.')
+	if maddildo = 1: iif(strapnumber = 7, 'Your 40cm dildo is attached to your strapon harness.','<a href="exec:strapnumber = 7 & gt ''stol'', ''strapon''">Attach</a> your 40cm long dildo.')
+	act 'Back': gt 'stol', $stol_loc_temp
 end
 
 if $ARGS[0] = 'bc':

locations/stripclub.qsrc

@@ -1,4 +1,6 @@
 # stripclub
+close all
+
 if $ARGS[0] = 'start':
 	*clr & cla
 	minut += 5

locations/stwork.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	gs 'din_van', 'prvt_pee'
 end
 

locations/stwork2.qsrc

@@ -359,14 +359,14 @@ if $ARGS[0] = 'pr1':
 		guy += 4
 		killvar '$boy'
 		i=rand(18,40)
-		gs 'npcgeneratec', 0, 'Private dance Client', i
+		gs 'npcgeneratec', 0, 'Private dance client', i
 		gs 'boyStat', $npclastgenerated
-		gs 'npcgeneratec', 0, 'Friend of Client', i
-		gs 'boyStat', $npclastgenerated,'1'
-		gs 'npcgeneratec', 0, 'Friend of Client', i
-		gs 'boyStat', $npclastgenerated,'2'
-		gs 'npcgeneratec', 0, 'Friend of Client', i
-		gs 'boyStat', $npclastgenerated,'3'
+		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'boyStat', $npclastgenerated, '1'
+		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'boyStat', $npclastgenerated, '2'
+		gs 'npcgeneratec', 0, 'Friend of client', i
+		gs 'boyStat', $npclastgenerated, '3'
 		picrand = 12
 		money += 4000
 		$sexloc = 'stwork'
@@ -391,6 +391,7 @@ if $ARGS[0] = 'pr2':
 	end	
 
 	act 'Agree':
+		gs 'npcgeneratec', 0, 'Private dance client', rand(20,55)
 		guy += 1
 		picrand = 39
 		money += 2000

locations/wardrobe.qsrc

@@ -16,7 +16,13 @@ if $ARGS[0] = 'start':
 		gs 'clothing', 'strip'
 	end
 	if ward_img_hgt = 0:ward_img_hgt = 150
-	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3><br><center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
+	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3>'
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+	'<center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center><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:

locations/zaprF.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	gs 'din_van', 'pblc_pee'
 end