Merge remote-tracking branch 'Gwen/master'

locations/NikoSlut.qsrc

@@ -1351,7 +1351,7 @@ if $ARGS[0] = 'Meal 1':
 	cumspclnt = 2
 	money -= 200
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/food/boris_meal1.jpg"></center>'
 	'You order some eggs, it doesn''t take to long until your food is ready. You get a plate of two eggs, hash browns, biscuit and some fruit, along with a cup hot tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
@@ -1367,7 +1367,7 @@ if $ARGS[0] = 'Meal 2':
 	cumspclnt = 2
 	money -= 300
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/food/boris_meal2.jpg"></center>'
 	'You order a burger, it doesn''t take to long until your food is ready. You get a plate with a large burger and fries, along with a cup tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
@@ -1383,7 +1383,7 @@ if $ARGS[0] = 'Meal 3':
 	cumspclnt = 2
 	money -= 300
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/food/boris_meal3.jpg"></center>'
 	'You order fried chicken, it doesn''t take to long until your food is ready. You get a plate of three pieces of chicken, fries and coleslaw, along with a cup tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'Salad':
 	cumspclnt = 2
 	money -= 200
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/salad.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/food/salad.jpg"></center>'
 	'You order a salad, it doesn''t take to long until your food is ready. You get a plate with a salad and some dressing on the side, along with a cup tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end

locations/Nudelake.qsrc

@@ -1,4 +1,5 @@
 # Nudelake
+!!2021/03/27
 
 $loc = 'Nudelake'
 $loc_arg = ''
@@ -114,7 +115,7 @@ if $ARGS[0] = 'voleybol':
 	menu_off = 0
 	*clr & cla
 	minut += 1
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/voleybol.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyball.jpg"></center>'
 	'You go to the volleyball court.'
 
 	act 'Watch':gt 'Nudelake', 'smotr'
@@ -129,7 +130,7 @@ if $ARGS[0] = 'voleybol':
 		vball_exp += rand(1,3)
 		minut += 30
 		inhib_exp += rand(1,3)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/voleybol.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyball.jpg"></center>'
 		'You go up to the players and ask whether it is possible to join in, they are happy to put you on a team.'
 
 		act 'Finish':gt 'Nudelake'
@@ -145,7 +146,7 @@ if $ARGS[0] = 'zagarat':
 	pcs_mood += 5
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_nude.jpg"></center>'
 
 	if krem = 0:
 		pcs_tan += 1
@@ -185,7 +186,7 @@ if $ARGS[0] = 'swim':
 	end
 	pcs_sweat = 10 + rand(0,4)
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/lake/nudeswim.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
 	'You go for a swim.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
@@ -198,7 +199,7 @@ if $ARGS[0] = 'smotr':
 	*clr & cla
 	minut += 30
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/voleybol.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyball.jpg"></center>'
 	'You watch the others play.'
 
 	act 'Leave':gt 'Nudelake'

locations/_attributes_gm_maid.qsrc

@@ -8,7 +8,7 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 2:
 	CloQuality = 3
@@ -16,7 +16,7 @@ elseif ARGS[1] = 2:
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 3:
 	CloQuality = 2
@@ -24,7 +24,7 @@ elseif ARGS[1] = 3:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 4:
 	CloQuality = 2
@@ -32,7 +32,7 @@ elseif ARGS[1] = 4:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 5:
 	CloQuality = 2
@@ -40,7 +40,7 @@ elseif ARGS[1] = 5:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 6:
 	CloQuality = 3
@@ -48,7 +48,7 @@ elseif ARGS[1] = 6:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 7:
 	CloQuality = 3
@@ -56,7 +56,7 @@ elseif ARGS[1] = 7:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 8:
 	CloQuality = 2
@@ -64,7 +64,7 @@ elseif ARGS[1] = 8:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 9:
 	CloQuality = 2
@@ -72,7 +72,7 @@ elseif ARGS[1] = 9:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 10:
 	CloQuality = 3
@@ -80,7 +80,7 @@ elseif ARGS[1] = 10:
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 11:
 	CloQuality = 2
@@ -88,7 +88,7 @@ elseif ARGS[1] = 11:
 	CloTopCut = 2
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 12:
 	CloQuality = 2
@@ -96,7 +96,7 @@ elseif ARGS[1] = 12:
 	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 13:
 	CloQuality = 2
@@ -104,7 +104,7 @@ elseif ARGS[1] = 13:
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 14:
 	CloQuality = 2
@@ -112,7 +112,7 @@ elseif ARGS[1] = 14:
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 15:
 	CloQuality = 2
@@ -120,7 +120,7 @@ elseif ARGS[1] = 15:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 16:
 	CloQuality = 5
@@ -128,7 +128,7 @@ elseif ARGS[1] = 16:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 17:
 	CloQuality = 3
@@ -136,7 +136,7 @@ elseif ARGS[1] = 17:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 18:
 	CloQuality = 3
@@ -144,7 +144,7 @@ elseif ARGS[1] = 18:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 19:
 	CloQuality = 3
@@ -152,7 +152,7 @@ elseif ARGS[1] = 19:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 20:
 	CloQuality = 3
@@ -160,7 +160,7 @@ elseif ARGS[1] = 20:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 21:
 	CloQuality = 3
@@ -168,7 +168,7 @@ elseif ARGS[1] = 21:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 22:
 	CloQuality = 3
@@ -176,7 +176,7 @@ elseif ARGS[1] = 22:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 23:
 	CloQuality = 3
@@ -184,7 +184,7 @@ elseif ARGS[1] = 23:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloBimbo = 1
 	
 elseif ARGS[1] = 24:
@@ -193,7 +193,7 @@ elseif ARGS[1] = 24:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 25:
 	CloQuality = 2
@@ -201,7 +201,7 @@ elseif ARGS[1] = 25:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 26:
 	CloQuality = 2
@@ -209,21 +209,21 @@ elseif ARGS[1] = 26:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 4
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 4
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloBimbo =1
 
 elseif ARGS[1] = 29:
@@ -231,7 +231,7 @@ elseif ARGS[1] = 29:
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloBimbo =1
 
 elseif ARGS[1] = 30:
@@ -240,14 +240,14 @@ elseif ARGS[1] = 30:
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 5
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 32:
 	CloQuality = 3
@@ -255,7 +255,7 @@ elseif ARGS[1] = 32:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 33:
 	CloQuality = 5
@@ -263,7 +263,7 @@ elseif ARGS[1] = 33:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 34:
 	CloQuality = 4
@@ -271,14 +271,14 @@ elseif ARGS[1] = 34:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 6
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 36:
 	CloQuality = 4
@@ -286,14 +286,14 @@ elseif ARGS[1] = 36:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloDress = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 elseif ARGS[1] = 37:
 	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloBimbo = 1
 	CloOnePiece = 1
 	
@@ -302,7 +302,7 @@ elseif ARGS[1] = 38:
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloOnePiece = 1
 
 elseif ARGS[1] = 39:
@@ -310,7 +310,7 @@ elseif ARGS[1] = 39:
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
-	CloStyle2 = 2
+	CloStyle2 = 1
 	CloOnePiece = 1
 
 elseif ARGS[1] = 39:
@@ -318,10 +318,9 @@ elseif ARGS[1] = 39:
 	CloThinness = 6
 	CloBra = 1
 	CloPanties = 1
-	CloStyle2 = 2
+	CloStyle2 = 1
 
 end
 
-
 --- $attributes_gm_maid ---------------------------------
 

locations/_attributes_gm_server.qsrc

@@ -1,5 +1,5 @@
 # $attributes_gm_server
-!!2021/03/07
+!!2021/03/29
 !!Quality range should be 2 to 5
 
 if ARGS[1] = 1:
@@ -218,13 +218,7 @@ elseif ARGS[1] = 30:
 	CloPantsShortness = 1
 	CloStyle2 = 2
 
-
-
-
-
-
 end
 
-
 --- $attributes_gm_server ---------------------------------
 

locations/albina_election_events.qsrc

@@ -81,7 +81,7 @@ $din_zajava_albfather = {
 				AlbinaQW['Friends'] = 1
 				AlbinaQW['StarletsShutDown'] = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/activities/calling_outdoor.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/calling_outdoor.jpg"></center>'
 				'You quickly dial Albina''s number and, in a panic, tell her what happened. She calms you down and asks if you told them anything. She sounds pleased when you tell her that you did. She thanks you and hangs up without another word, leaving you a little confused.'
 
 				act 'Leave':gt 'pav_commercial'
@@ -135,7 +135,7 @@ $din_zajava_albfather_no2 = {
 			AlbinaQW['Friends'] = 1
 			AlbinaQW['StarletsShutDown'] = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/activities/calling_outdoor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/phone/calling_outdoor.jpg"></center>'
 			'You quickly dial Albina''s number and, in a panic, tell her what happened. She calms you down and asks if you told them anything. She sounds a bit disappointed when you tell her you didn''t. You are confused as she abruptly hangs up.'
 
 			act 'Leave':gt 'pav_commercial'

locations/beg1.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'br':
     end
     begresult = pcs_run - begminus
     
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
     'Your discipline: The Women''s 400 Meter Dash.' 
     'After changing into your running gear, you spend some time warming up near the track before the race starts. Beyond some casual bystanders and encouraging familiars, no spectators are attending this competition.' 
     'When you and the other runners are called, you walk to your starting position, tense but ready.' 
@@ -117,7 +117,7 @@ if $ARGS[0] = 'kms':
     end
     begresult = pcs_run - begminus
     
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
     'Your discipline: The Women''s 400 Meter Dash.' 
     'After changing into your running gear, you spend some time warming up near the track before the race starts. Beyond the encouraging familiars, now, you appreciate some genuinely interested spectators, some with cameras, but, even with that, no more than a hundred spectators are attending this competition. The track field is far from full.' 
     'When you and the other runners are called, you walk to your starting position, tense but ready.' 
@@ -174,7 +174,7 @@ if $ARGS[0] = 'ross':
     end
     begresult = pcs_run - begminus
     
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
     'Your discipline: The Women''s 400 Meter Dash.' 
     'After changing into your running gear, you spend some time warming up near the track before the race starts. Familiars, the club''s fans, track''s lovers and students on a school trip, fill the place. You even see some photo journalists. All of them showing genuine interest in this competition. A gross appraisal put the spectators'' numbers in several hundred attending this competition. The track field is in full occupation.' 
     'When you and the other runners are called, you walk to your starting position, tense but ready.' 
@@ -234,7 +234,7 @@ if $ARGS[0] = 'kval':
     end
     begresult = pcs_run - begminus
     
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
     'Your discipline: The Women''s 400 Meter Dash.'  
     'At the professional level, your club takes you, to the Petrovsky Stadium. After changing into your running gear, you spend some time warming up before the race starts and observe the current attendance. Now, this is what you call a spectacle. Thousands of people, come to see the race, including photo journalists, TV crews and all class of sports enthusiasts. Even with that, the stadium is far from full, with maybe a quarter capacity, that is around 5000 spectators.'
 !! Took the Krestovsky Stadium for reference. !!THX note. the  Krestovsky Stadium is football-only. Better use the Petrovsky Stadium(20000), have track fields.
@@ -298,7 +298,7 @@ if $ARGS[0] = 'evro':
     end
     begresult = pcs_run - begminus
     
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
     'Your discipline: The Women''s 400 Meter Dash.' 
     'This is the highest competition in the St. Petersburg area. From here, the professional runners, jump to the regional, national and eventually international scene. You will eventually reach those levels, with the possibility to reach the country Olympic Team, but for the moment, it is better if you concentrate on reaching the St. Petersburg Championship.'   
     'After changing into your running gear, you spend some time warming up before the race starts and observe the current attendance. The Petrovsky Stadium''s personnel is in full gear to manage the wave of spectators, journalist, and others that run around. Even with the fact, that track & field don''t attract the same attention level that football, it is evident that this is a great event, with maybe around 10000 spectators.'

locations/city_lake.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'start':
 				pcs_sweat = 10 + rand(0,4)
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
 				'You swim in the lake, the water refreshes and invigorates.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
@@ -123,7 +123,7 @@ if $ARGS[0] = 'start':
 						pcs_hydra -= 20
 					end
 					pcs_mood += 5
-					'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_swimsuit.jpg"></center>'
 
 					if krem = 0:
 						pcs_tan += 1
@@ -131,7 +131,7 @@ if $ARGS[0] = 'start':
 					else
 						krem -= 1
 						pcs_tan += 3
-						'You smear your body with sunblock and sunbathe.'
+						'You apply sunblock to your body before sunbathing.'
 					end
 
 					evrand = rand(0, 100)

locations/city_park.qsrc

@@ -305,8 +305,8 @@ if $ARGS[0] = 'luna':
 			minut += 60
 			money += 50
 			pcs_mood -= 5
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
-			'For an hour straight, you walk through the park and the fun fair, chatting up random visitors and trying to give them one of your flyers. After that, you are paid 50 <b>₽</b> for your effort.'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/job_flyer.jpg"></center>'
+			'For an hour straight, you walk through the park and the funfair, chatting up random visitors and trying to give them one of your flyers. After that, you are paid 50 <b>₽</b> for your effort.'
 
 			act 'Move away':gt 'city_park', 'luna'
 		end

locations/clothing.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'view_clothing_list':
 		'<center><img src="images/locations/oldtown/exhibitshop/shop_name.png"></center>'
 	elseif $ARGS[2] = 'dolls':
 		!'<center><b><font color="maroon">Viewing clothes from Patchwork Dolls</font></b></center>'
-		'<center><img src="images/locations/city/island/dolls.png"></center>'
+		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
 	elseif $ARGS[2] = 'sports':
 		!'<center><b><font color="maroon">Viewing sportswear from Danilovich</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0:'<center><a href="exec:$ward_list_store = ''exhibitshop'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
 
-		if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:$ward_list_store = ''dolls'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
+		if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:$ward_list_store = ''dolls'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a></center>'
 
 		if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/oldtown/bomba/shop_name.png"></a></center>'
 

locations/clothing_QV.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
 
-	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
+	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a></center>'
 
 	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''bomba''"><img src="images/locations/oldtown/bomba/shop_name.png"></a></center>'
 
@@ -570,7 +570,7 @@ if $ARGS[0] = 'list':
 		*clr & cla
 		$ward_list_store = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/island/dolls.png"></center>'
+		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl

locations/coats.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'view_coat_list':
 	end
 
 	if ARRSIZE('dolls_coats') > 0:
-		'<center><img src="images/locations/city/island/dolls.png"></center>'
+		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
 
 		i = 1
 		:loopdollscoat 

locations/dormev1.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'gangbang_selfie':
 	*clr & cla
 	djibrilphoto[2] = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/pictures/djibril/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/phone/djibril/2.jpg"></center>'
 	'Once they are done cumming all over you, they start to get cleaned up and get dressed. You reach over to your purse and pull out your phone, and you hold it up and take a selfie of your face covered in their cum. You take a couple of them until you find one you like, which you then save. You notice a couple of them looking at you smiling, as you take your selfies. With that done you start to get dressed yourself.'
 	act 'Get dressed': gt 'dormev1', 'gangbang_dress'
 end

locations/etoexhib.qsrc

@@ -547,7 +547,7 @@ if $ARGS[0] = 'pos16':
 			gs 'exercise', 'tier1', 1, 'stren_exp'
 			pcs_sweat = 10 + rand(0,4)
 
-			'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
 			'You swim in the lake, the water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 

locations/gLakeNude.qsrc

@@ -169,10 +169,10 @@ if temper >= 15 and month >= 5 and month <= 9:
 			if pcs_stren < 30: stren_exp += 1
 			fat -= 1
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swimnude.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
 				if pcs_inhib < 60:inhib_exp += rand(1,2)
 			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swim.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 			end
 			'You play around and have fun in the lake, enjoying the feeling of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
@@ -191,10 +191,10 @@ if temper >= 15 and month >= 5 and month <= 9:
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
 				if PCloswimwear = 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_swimsuit.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbathnude.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_nude.jpg"></center>'
 					inhib_exp += rand(1,3)
 				end
 				if krem = 0:

locations/glake.qsrc

@@ -247,10 +247,10 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			if pcs_stren < 30: stren_exp += 1
 			fat -= 1
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swimnude.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
 				inhib_exp += rand(1,2)
 			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swim.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
 				if pcs_inhib < 50: inhib_exp += rand(1,2)
 			end
 			'You swim and play in the lake, feeling refreshed and invigorated by the clean lake water.'
@@ -267,10 +267,10 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				pcs_mood += 5
 				gs'stat'
 				if PCloswimwear = 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_swimsuit.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbathnude.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/tanning_nude.jpg"></center>'
 					inhib_exp += rand(1,3)
 				end
 
@@ -279,7 +279,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 					pcs_tan = pcs_tan + 1
 				else
 					krem = krem - 1
-					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
+					'You apply sunscreen to yourself and lie down on the towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 					pcs_tan = pcs_tan + 3
 				end
 

locations/gschool_events.qsrc

@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'afterschool_events':
 					gs 'drugs', 'alcohol', 'vodka', 1
 					grupvalue[4] += 1
 					npc_rel['A143'] += 1
-					'<center><img <<$set_imgh>> src="images/pc/activities/drinkingalcohol.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/alcohol.jpg"></center>'
 					'You take the offered bottle and take a swig of it yourself. It burns as it goes down. This is some of the cheapest vodka you have ever tasted. Coughing a bit, you hand it back to her and she smiles. "Fuck that''s strong!"'
 					'She takes another long swig from the bottle. "Well I don''t drink this shit for the taste, but for the effect." She offers you the bottle again.'
 

locations/gschool_lessons1.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'russian':
 
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
@@ -176,7 +176,7 @@ if $ARGS[0] = 'russian':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' You fight with your blouse to cover yourself back up. Once it is finally back in place, you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 				end
@@ -200,7 +200,7 @@ if $ARGS[0] = 'russian':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -223,7 +223,7 @@ if $ARGS[0] = 'russian':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -688,7 +688,7 @@ if $ARGS[0] = 'geography':
 				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mrs. Sokoloff even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
@@ -708,7 +708,7 @@ if $ARGS[0] = 'geography':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 				end
@@ -732,7 +732,7 @@ if $ARGS[0] = 'geography':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 					end
@@ -755,7 +755,7 @@ if $ARGS[0] = 'geography':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -1206,7 +1206,7 @@ if $ARGS[0] = 'history':
 				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them, you manage to take them with out Mr. Yenotin even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end
@@ -1226,7 +1226,7 @@ if $ARGS[0] = 'history':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/phone/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 				end
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'history':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 					end
@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'history':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end

locations/gschool_lessons2.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'computer':
 				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mr. Ivanov even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
@@ -184,7 +184,7 @@ if $ARGS[0] = 'computer':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 				end
@@ -208,7 +208,7 @@ if $ARGS[0] = 'computer':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 					end
@@ -231,7 +231,7 @@ if $ARGS[0] = 'computer':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -724,7 +724,7 @@ if $ARGS[0] = 'science':
 				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Miss Orlov even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
@@ -744,7 +744,7 @@ if $ARGS[0] = 'science':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
@@ -768,7 +768,7 @@ if $ARGS[0] = 'science':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 					end
@@ -791,7 +791,7 @@ if $ARGS[0] = 'science':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'music':
 				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mr. Vasilyev even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
@@ -1169,7 +1169,7 @@ if $ARGS[0] = 'music':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash,you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 				end
@@ -1193,7 +1193,7 @@ if $ARGS[0] = 'music':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 					end
@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'music':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end
@@ -1658,7 +1658,7 @@ if $ARGS[0] = 'biology':
 				*clr & cla
 				i = rand(1,classroom_clotot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
-				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 				'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Miss Orlov even noticing.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 			end
@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'biology':
 					gs 'fame', 'pav', 'sex', 3
 					i = rand(1,classroom_titflash)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 					'Feeling particularily brash, you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and might be useful for teasing someone later. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like.'+iif(pcs_cupsize >= 30, ' Your fight with your blouse to cover yourself back up. Once it is finally back in place you take a look around and see a few grinning faces among your classmates. ', '')+'You save that one to your phone and delete the rest.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 				end
@@ -1692,7 +1692,7 @@ if $ARGS[0] = 'biology':
 						gs 'fame', 'pav', 'sex', 3
 						i = rand(1,classroom_pussyflash)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone later to tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 					end
@@ -1715,7 +1715,7 @@ if $ARGS[0] = 'biology':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 						'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 					end

locations/gschool_lessons3.qsrc

@@ -1,5 +1,5 @@
 # gschool_lessons3
-!2020/10/16
+!2021/03/27
 !!classes this file art, shop, and literature
 
 if $ARGS[0] = 'literature':
@@ -589,7 +589,7 @@ if $ARGS[0] = 'art':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_closelfie[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 					'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mr. Vasilyev even noticing.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 				end
@@ -609,7 +609,7 @@ if $ARGS[0] = 'art':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_titflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 						'You think that taking a selfie of your bare bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 					end
@@ -633,7 +633,7 @@ if $ARGS[0] = 'art':
 							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'You feel the excitement growing inside you at the idea. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 						end
@@ -656,7 +656,7 @@ if $ARGS[0] = 'art':
 							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 						end
@@ -1153,7 +1153,7 @@ if $ARGS[0] = 'shop':
 					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_closelfie[<<i>>] = 1'
-					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
 					'Just a cute selfie. Nothing too daring, yet it gives you something to do. You take several selfies of yourself until you find one you like. You keep it and delete the rest of them. You manage to take them without Mr. Kuznetsov even noticing.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 				end
@@ -1173,7 +1173,7 @@ if $ARGS[0] = 'shop':
 						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_titflash[<<i>>] = 1'
-						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
 						'Feeling particularily brash,you decide taking a selfie of your bare breasts in the middle of class is a great idea. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open your shirt and expose your tits. You take a couple of quick selfies of your exposed breasts until you get one you really like. You save that one to your phone and delete the rest.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 					end
@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'shop':
 							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'You can feel the excitement in your pussy as you imagine yourself baring it in class to take a selfie of it. Maybe you will share it, maybe not, but either way it should be fun and could be fun to send to someone and tease them with it. You glance around and when everyone is busy, you pull open up your skirt and pull your panties aside until your pussy is exposed. You take a couple of quick selfies of your exposed pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 						end
@@ -1220,7 +1220,7 @@ if $ARGS[0] = 'shop':
 							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
-							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/phone/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
 							'You can feel yourself getting wet as you imagine taking a selfie of yourself while not wearing your panties. Maybe you will share it, maybe not, but either way it could be fun. You glance around and when everyone looks busy, you pull open up your skirt, exposing your already bare pussy. You take a couple of quick selfies of your pussy until you get one you really like. You save that one to your phone and delete the rest.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 						end

locations/hookup_morning.qsrc

@@ -304,11 +304,11 @@ if $ARGS[0] = 'wakeup':
 						cla & *clr
 						minut += 2
 						gs 'beverage','coffee'
-						'<center><img <<$set_imgh>> src="images/shared/drinks/coffee_bed1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
 						'Your attention is completely consumed by the coffee as you drink it greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
 						act'Time to get going':
 							cla & *clr
-							'<center><img <<$set_imgh>> src="images/shared/drinks/coffee_bed1.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Get dressed':gt'hookup_morning','morning_leave'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'wakeup':
 						cla & *clr
 						minut += 2
 						gs 'beverage','coffee'
-						'<center><img <<$set_imgh>> src="images/shared/drinks/coffee_bed1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
 						'You make small talk while drinking coffee.'
 						act'Time to get going':
 							cla & *clr
@@ -648,7 +648,7 @@ if $ARGS[0] = 'coffee':
 				minut += 2
 				gs 'beverage','coffee'
 				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/shared/drinks/nude_coffee1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
 				else
 					$npc_apt_kitchen
 				end
@@ -687,7 +687,7 @@ if $ARGS[0] = 'coffee':
 				minut += 2
 				gs 'beverage','coffee'
 				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/shared/drinks/nude_coffee1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
 				else
 					$npc_apt_kitchen
 				end
@@ -711,7 +711,7 @@ if $ARGS[0] = 'coffee':
 				gs 'beverage','coffee'
 				if $clothingworntype = 'nude':
 					!! if possible, replace with two people drinking coffee naked
-					'<center><img <<$set_imgh>> src="images/shared/drinks/nude_coffee1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
 					'You make small talk as you sip your coffee.'
 				else
 					$npc_apt_kitchen
@@ -743,7 +743,7 @@ if $ARGS[0] = 'coffee':
 				cla & *clr
 				minut += 2
 				gs 'beverage','coffee'
-				'<center><img <<$set_imgh>> src="images/shared/drinks/nude_coffee1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/drinking/nude_coffee1.jpg"></center>'
 				'You grab a mug and fill it up, drinking greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
 				'"No breakfast for you? Or... anything else...?"'
 				'"Coffee is all I need," you smirk back.'

locations/krupo.qsrc

@@ -10,7 +10,7 @@ gs'stat'
 gs 'themes', 'indoors'
 
 '<center><b><font color = maroon>Sewing circle</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/sew/sewing_lesson.jpg"></center>'
 if pcs_sewng < 40:
 	sewng_exp += rand(pcs_intel/20, pcs_intel/10)
 	minut += 60

locations/ludahome.qsrc

@@ -199,7 +199,7 @@ end
 
 if $ARGS[0] = 'textanya':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/pc/activities/text_indoor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 	'The two of you sit down on the couch while, you send Anya a text "Hey what are you doing?"'
 	!! This is very much EXPERIMENTAL so 1. needs to be adjusted if anya''s schedule changes and 2. might be incorrect
 	gs 'family_schedule'
@@ -237,7 +237,7 @@ end
 
 if $ARGS[0] = 'textnush':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/pc/activities/text_indoor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 	'The two of you sit down on the couch while, you send Anushka a text "Hey what are you doing?"'
 	!! Anushka will always be busy during school hours, and all day on Wednesday and Fridays. She will also be busy after 18:00 on Saturdays. The rest of the time make it a random 1 in 4 she is not busy, so on a 4 it goes to the else below
 	if hour < 8 or (week < 6 and hour < 14) or week = 3 or week = 5 or (week = 6 and hour >= 18) or rand(0,3) > 0: OluQW['nush_busy'] = daystart
@@ -274,7 +274,7 @@ end
 
 if $ARGS[0] = 'textnatasha':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/pc/activities/text_indoor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 	'The two of you sit down on the couch while, you send Natasha a text "Hey what are you doing?"'
 	!OluQW['nat_busy'] = rand(1,4)
 	!if OluQW['nat_busy'] >= 3:

locations/olutaxi.qsrc

@@ -343,7 +343,7 @@ if $ARGS[0] = 'djibril_selfie_anal':
 	*clr & cla
 	djibrilphoto[1] = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/pictures/djibril/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/phone/djibril/1.jpg"></center>'
 	'As Djibril very large black dick violates your ass, you grab your phone out of your purse. You try to focus but the hard pounding your ass is recieving makes that difficult. You finally manage to get the phone up in front of your face and you take a selfie, you take several more. Djibril seems unaware of maybe he just doesn''t care that you are taking selfies while he ploughs your ass. You take a look at the selfies you took, yep all of them show your mixture of pain and pleasure from the ass pounding you are taking. You pick the one you like the most and save it, while deleting the rest.'
 	gs 'arousal', 'anal', 2, 'exhibitionism'
 	gs 'arousal', 'auto_lube', 'anal'

locations/pav_commclubs.qsrc

@@ -33,8 +33,8 @@ if hour >= 12 and hour < 20:
 			menu_off = 1
 			gs 'stat'
 			'<center><b><font color = maroon>Sewing circle</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
-			'You go to the sewing club room. As you walk in, a teacher looks at you and says "It costs 500 <b>₽</b> for one month to join and you can come as many days as you like. Once the month is up, any days you did not attend are not refunded."'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/sew/sewing_class.jpg"></center>'
+			'You go to the sewing club room. As you walk in, a teacher looks at you and says "It costs 500 <b>₽</b> for one month's lessons and you can attend as many times as you like. The days you did not attend are not refundable when the one month is finished."'
 			if money >= 500:
 				act 'Sign up':
 					cls

locations/pav_park.qsrc

@@ -157,13 +157,13 @@ if $ARGS[0] = 'start':
 			*clr & cla
 			menu_off = 1
 			minut += 60
-			money += 50
+			money += 60
 			pcs_mood -= 5
 			gs 'stat'
 			'<center><h2>Pavlovsk Park</h2></center>'
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/job_flyer.jpg"></center>'
 			*nl
-			'You spend an hour handing out flyers to park visitors, advertising something or another. You get paid 50 <b>₽</b> for your efforts.'
+			'You spend an hour handing out advertising flyers to park visitors. You received 60 <b>₽</b> for your efforts.'
 
 			act 'Continue':gt 'pav_park', 'start'
 		end

locations/pav_shared_apt.qsrc

@@ -704,7 +704,7 @@ if $ARGS[0] = 'pcsRoom':
 	gs 'pav_shared_apt', 'update'
 
 	'<center><b><font color="maroon">Living Room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/sharedapt/bedroom/sofabed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/sofabed.jpg"></center>'
 	*nl
 	'The living room was never used by the other apartment occupants, so it''s now rented out as a bedroom. It''s sparsely decorated, with, a <a href="exec:gt ''bed'', ''start''">sofa bed</a>, against the back wall.'
 	*nl
@@ -718,7 +718,7 @@ if $ARGS[0] = 'pcsRoom':
 	*nl
 	'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.'
 	*nl
-	'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-existent window curtains.'
+	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/home/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-existent window curtains.'
 
 	act '<b>Leave the room</b>':gt 'pav_shared_apt', 'start'
 
@@ -819,7 +819,7 @@ if $ARGS[0] = 'sofabed':
 	$loc_arg = 'sofabed'
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/shared/sharedapt/bedroom/sofabed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/sofabed.jpg"></center>'
 	'<center>A small sofa bed, when not unfolded, is just big enough for you to curl up on and take a nap.</center>'
 
 	if TV = 1:

locations/phone_selfies.qsrc

@@ -1,5 +1,5 @@
 # phone_selfies
-!2020/10/16
+!2021/03/27
 !{ HOW TO USE:
 - UNLOCKING A PICTURE:
 	There are different types of pictures that can be viewed with the phone. These need to be unlocked for them to become viewable.
@@ -244,7 +244,7 @@ if $ARGS[0] = 'listretrieve':
 		:temp_loop
 			!!setting value to unmixed variable so it can be checked in the if below
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_closelfie[<<temp_clocnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''clothed'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/clothed/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''clothed'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/clothed/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
 			temp_clocnt += 1
 		if temp_clocnt <= selfieClotot[ARGS[1]]: jump'temp_loop'
 	end
@@ -257,7 +257,7 @@ if $ARGS[0] = 'listretrieve':
 		:temp_loop1
 			!!setting value to unmixed variable so it can be checked in the if below
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_swim[<<temp_clocnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bikini'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/bikini/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bikini'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/bikini/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
 			temp_clocnt += 1
 		if temp_clocnt <= selfieSwimtot[ARGS[1]]: jump'temp_loop1'
 	end
@@ -269,7 +269,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_undcnt = 1
 		:temp_loop2
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_undselfie[<<temp_undcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''underwear'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/underwear/<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''underwear'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/underwear/<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>.jpg"     height="150" /></a>  '
 			temp_undcnt += 1
 		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump'temp_loop2'
 	end
@@ -281,7 +281,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_nudcnt = 1
 		:temp_loop3
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_nudselfie[<<temp_nudcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''nude'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/nude/<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''nude'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/nude/<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>.jpg"     height="150" /></a>  '
 			temp_nudcnt += 1
 		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump'temp_loop3'
 	end
@@ -293,7 +293,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_bathcnt = 1
 		:temp_loop4
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_bathselfie[<<temp_bathcnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bath'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/bath/<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bath'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/bath/<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>.jpg"     height="150" /></a>  '
 			temp_bathcnt += 1
 		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump'temp_loop4'
 	end
@@ -305,7 +305,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_showercnt = 1
 		:temp_loop5
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_showerselfie[<<temp_showercnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''shower'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/shower/<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''shower'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/shower/<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>.jpg"     height="150" /></a>  '
 			temp_showercnt += 1
 		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump'temp_loop5'
 	end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashtitscnt = 1
 		:temp_loop6
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_titflash[<<temp_flashtitscnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''titflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/titflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''titflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/titflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>.jpg"     height="150" /></a>  '
 			temp_flashtitscnt += 1
 		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump'temp_loop6'
 	end
@@ -329,7 +329,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashasscnt = 1
 		:temp_loop7
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_assflash[<<temp_flashasscnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''assflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/assflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''assflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/assflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>.jpg"     height="150" /></a>  '
 			temp_flashasscnt += 1
 		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump'temp_loop7'
 	end
@@ -341,7 +341,7 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashpussycnt = 1
 		:temp_loop8
 			dynamic '$phone_locval = <<$selfieLoc[ARGS[1]]>>_pussyflash[<<temp_flashpussycnt>>]'
-			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''pussyflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>''"><img src="images/pc/activities/selfies/<<$selfieLoc[ARGS[1]]>>/pussyflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>.jpg"     height="150" /></a>  '
+			if $phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''pussyflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/pussyflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>.jpg"     height="150" /></a>  '
 			temp_flashpussycnt += 1
 		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump'temp_loop8'
 	end
@@ -428,7 +428,7 @@ if $ARGS[0] = 'populateClothesType':
 		dynamic '$phone_locval = <<$selfieLoc[temp_locationCnt]>>_<<$CloTypePrefix>>[<<temp_clocnt>>]'
 		if $phone_locval = 1:
 			dyneval 'tmpIndex = <<$CloArraySize>>'
-			dyneval "<<$CloVar>> = 'images/pc/activities/selfies/<<$selfieLoc[temp_locationCnt]>>/<<$CloFolder>>/<<$selfieFilePrefix[temp_locationCnt]>><<temp_clocnt>>.jpg'"
+			dyneval "<<$CloVar>> = 'images/pc/activities/phone/selfies/<<$selfieLoc[temp_locationCnt]>>/<<$CloFolder>>/<<$selfieFilePrefix[temp_locationCnt]>><<temp_clocnt>>.jpg'"
 		end
 		temp_clocnt += 1
 	if temp_clocnt <= CloMaxSize: jump'tempCloTakenLoop'

locations/phone_selfies_popup.qsrc

@@ -4,9 +4,9 @@
 
 if $ARGS[0] = 'show':
 	if usePopUps = 1:
-		msg '<img src="images/pc/activities/selfies/<<ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg">'
+		msg '<img src="images/pc/activities/phone/selfies/<<ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg">'
 	else
-		view 'images/pc/activities/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg'
+		view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg'
 	end
 end
 

locations/preSYS2.qsrc

@@ -275,7 +275,7 @@ if $ARGS[0] = 'modpur':
 	end	
 	act 'Get Dolls':
 		*clr & cla
-		'<center><img src="images/locations/city/island/dolls.png"></center>'
+		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
 		i = 1
 		:loopdollspurses
 		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/items/dolls/purses/<<i>>.jpg" 	height="300" /></a>'

locations/purses.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'view_purse_list':
 		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
 	end
 
-	'<center><img src="images/locations/city/island/dolls.png"></center>'
+	'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
 
 	i = 1
 	:loopdollspurses

locations/telefon.qsrc

@@ -1312,9 +1312,9 @@ if $ARGS[0] = 'Phone_camera_selfie':
 		dynamic '<<$selfieLoc[0]>>_closelfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/pc/activities/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg">'
+			msg '<img src="images/pc/activities/phone/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg">'
 		else
-			view 'images/pc/activities/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg'
+			view 'images/pc/activities/phone/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg'
 		end
 	end
 	!if spdirtyf > 0: phone_rand = RAND (m,n) - for SELF in the semen
@@ -1342,9 +1342,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_swim[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/bikini/<<phone_rand>>.jpg'
 				end
 			end
 		elseif $clothingworntype ! 'nude':
@@ -1360,9 +1360,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_closelfie[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/clothed/<<phone_rand>>.jpg'
 				end
 			end
 		elseif $pantyworntype ! 'none':
@@ -1376,9 +1376,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_undselfie[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/underwear/<<phone_rand>>.jpg'
 				end
 			end
 		else
@@ -1392,9 +1392,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_nudselfie[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/nude/<<phone_rand>>.jpg'
 				end
 			end
 		end
@@ -1410,9 +1410,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_titflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg'
+					view 'images/pc/activities/selfies/phone/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg'
 				end
 			end
 		elseif $ARGS[2] = 'ass':
@@ -1426,9 +1426,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_assflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg'
 				end
 			end
 		elseif $ARGS[2] = 'pussy':
@@ -1442,9 +1442,9 @@ if $ARGS[0] = 'Phone_selfie_image':
 				dynamic '<<$ARGS[1]>>_pussyflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
-					msg '<img src="images/pc/activities/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg">'
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg'
 				end
 			end
 		end
@@ -1466,9 +1466,9 @@ if $ARGS[0] = 'Phone_selfie_image_bathing':
 		dynamic 'bathroom_showerselfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/pc/activities/selfies/bathroom/shower/<<phone_rand>>.jpg">'
+			msg '<img src="images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg">'
 		else
-			view 'images/pc/activities/selfies/bathroom/shower/<<phone_rand>>.jpg'
+			view 'images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg'
 		end
 	elseif $ARGS[1] = 'bath':
 		if Enable_Android = 1:
@@ -1480,9 +1480,9 @@ if $ARGS[0] = 'Phone_selfie_image_bathing':
 		dynamic 'bathroom_bathselfie[<<phone_rand>>] = 1'
 		gs 'stat'
 		if usePopUps = 1:
-			msg '<img src="images/pc/activities/selfies/bathroom/bath/<<phone_rand>>.jpg">'
+			msg '<img src="images/pc/activities/phone/selfies/bathroom/bath/<<phone_rand>>.jpg">'
 		else
-			view 'images/pc/activities/selfies/bathroom/bath/<<phone_rand>>.jpg'
+			view 'images/pc/activities/selfies/phone/bathroom/bath/<<phone_rand>>.jpg'
 		end
 	end
 end

locations/ybass.qsrc

@@ -22,7 +22,7 @@ act 'Swim (1:00)':
 	if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 	if pcs_stren < 40:stren_exp += 1
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
 	'You swim in the pool. The water refreshes and invigorates.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'