Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/foto.qsrc

@@ -796,7 +796,17 @@ if $ARGS[0] = 'interview2':
 	if pcs_inhib >= 40:
 		act 'Do as he says':
 			*clr & cla
+			if underwear['type'] = 2:
+				$lastwornbodysuittype['foto'] = $bodysuitworntype
+				lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+			else
+				$lastwornpantytype['foto'] = $pantyworntype
+				lastwornpantynumber['foto'] = pantywornnumber
+				$lastwornbratype['foto'] = $braworntype
+				lastwornbranumber['foto'] = brawornnumber
+			end
 			if $clothingworntype ! 'nude': gs 'shortgs', 'undress'
+
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
 			if pcs_bmi < foto_weight and foto_weight > 0:
@@ -846,6 +856,15 @@ if $ARGS[0] = 'interview2':
 		act'Reluctantly undress (<<will_cost>> Willpower)':
 			reluctant_undress = 1
 			*clr & cla
+			if underwear['type'] = 2:
+				$lastwornbodysuittype['foto'] = $bodysuitworntype
+				lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+			else
+				$lastwornpantytype['foto'] = $pantyworntype
+				lastwornpantynumber['foto'] = pantywornnumber
+				$lastwornbratype['foto'] = $braworntype
+				lastwornbranumber['foto'] = brawornnumber
+			end
 			if $clothingworntype ! 'nude': gs 'shortgs', 'undress'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'

locations/pav_park.qsrc

@@ -447,7 +447,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park_jeans.jpg"></center>'
 	end
 
-	if pcs_makeup > 1:pcs_makeup = 0 & vidageday -= 1 & 'Your makeup smears across your face as you sleep, which is harmful to your appearance. Your skin ages faster from this.'
+	if pcs_makeup ! 1 and cosmetic_tattoo = 0:pcs_makeup = 0 & vidageday -= 1 & 'Your makeup smears across your face as you sleep, which is harmful to your appearance. Your skin ages faster from this.'
 
 	'You''re feeling tired and decide to try and get some sleep on the park bench.'
 	if alko >= 7 and hotcat >= 6:

locations/shop_pussycats.qsrc

@@ -749,8 +749,9 @@ if $ARGS[0] = '14':
 end
 
 if $ARGS[0] = '15':
+	i = rand(1, 413)
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/pc/item/gm/outfits/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<i>>.jpg"></center>'
 	'You go to the changing booths and find that someone has left an outfit behind. You remember that it belongs to a girl who just 5 minutes ago bought an outfit and left the store. Apparently, she decided she no longer needs this and just left it in the booth.'
 	'You decide to wait until the end of the shift, as the shopper may return. An hour passes and your shift ends, but nobody comes for it. You carefully look at it, it is an ordinary outfit from G&M, almost new, no holes, fairly clean. Could you just keep it for yourself?'
 
@@ -761,7 +762,6 @@ if $ARGS[0] = '15':
 		act 'Keep it (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'resist'
-			i = rand(1, 413)
 			'Before leaving, you take the outfit with you. The girl didn''t seem to want it, and you''re not about to throw away fairly new clothing. Your mother raised you better than that!'
 
 			! WD: Uninitialised ~ 'wear_chest_have_'