Merge remote-tracking branch 'hornguy6/master'

locations/din_van.qsrc

@@ -50,7 +50,12 @@ $bteeth = {
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brushteeth.jpg"></center>'
+			if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
+				'<center><video autoplay loop src="images/shared/home/bathroom/brushteeth.mp4"></center>'
+				play 'sound/brushteeth.mp3',100
+			else
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brushteeth.jpg"></center>'
+			end
 			*nl
 			'You brush your teeth and now they are clean and minty fresh.'
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg

locations/foto.qsrc

@@ -262,14 +262,14 @@ if $ARGS[0] = 'studio':
 			if studio_underwear_steal > 0:
 				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 				'You go to your locker in the back room and start to throw on your clothes when you suddenly remember that one of the managers took your underwear earlier today. You''ll have to go see him to get it back...'
 				act'Go see the manager':gt'foto_events','underwear_steal2'
 			else
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 				'You go into the back room to put on clothes and get ready to go home.'
 				act 'Leave': minut += 1 & gt 'city_center'
 			end

locations/foto_events.qsrc

@@ -260,7 +260,7 @@ end
 		
 if $ARGS[0] = 're-dress':
 	cla & *clr
-	'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+	'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 	minut += 10
 	gs 'underwear', 'wear'
 	gs 'stat'
@@ -1516,7 +1516,7 @@ if $ARGS[0] = 'topless1.1':
 	gs 'underwear', 'wear'
 	gs 'stat'
 	gs 'clothing', 'wear_last_worn'
-	'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+	'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 	'You run to your makeup station and get your makeup straighted out before running back to the dressing room and throwing your clothes on.'
 	act'Continue':
 		*clr & cla

locations/talent_agency.qsrc

@@ -165,7 +165,7 @@ if $ARGS[0] = 'SMTV_shy':
 									*clr & cla
 									gs 'underwear', 'wear'
 									gs 'stat'
-									'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+									'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 									gs 'clothing', 'wear_last_worn'
 									actpayfin = ((4000 + (pcs_mdlng * 25) + (pcs_apprnc * 2) + (pcs_inhib * 3)) * 3)
 									'You change back into your clothes while Mr. Yanovich does something at the desk.'
@@ -251,7 +251,7 @@ if $ARGS[0] = 'SMTV_confident':
 									*clr & cla
 									gs 'underwear', 'wear'
 									gs 'stat'
-									'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+									'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 									gs 'clothing', 'wear_last_worn'
 									actpayfin = (4000 + (pcs_mdlng * 25) + (pcs_apprnc * 2) + (pcs_inhib * 5)) * 3
 									'You change back into your clothes while Mr. Yanovich does something at the desk.'