Merge remote-tracking branch 'rachels/master'

LinksToSkip.txt

@@ -1,5 +1,29 @@
 images" folder of the game with a file of the same name and format (.jpg
+images/beast/zoo/primer.jpg
+images/beast/zoo/rimma.jpg
+images/beast/zoo/rimma10.jpg
+images/beast/zoo/rimma11.jpg
+images/beast/zoo/rimma12.jpg
+images/beast/zoo/rimma13.jpg
+images/beast/zoo/rimma14.jpg
+images/beast/zoo/rimma15.jpg
+images/beast/zoo/rimma16.jpg
+images/beast/zoo/rimma17.jpg
+images/beast/zoo/rimma18.jpg
+images/beast/zoo/rimma19.jpg
+images/beast/zoo/rimma2.jpg
+images/beast/zoo/rimma20.jpg
+images/beast/zoo/rimma21.jpg
+images/beast/zoo/rimma3.jpg
+images/beast/zoo/rimma4.jpg
+images/beast/zoo/rimma5.jpg
+images/beast/zoo/rimma6.jpg
+images/beast/zoo/rimma7.jpg
+images/beast/zoo/rimma8.jpg
+images/beast/zoo/rimma9.jpg
+images/beast/zoo/rimmabj.jpg
 images/characters/city/vika/'+iif(ARGS[1]=0,5,3)+'.jpg
+images/characters/pavlovsk/resident/Anna/sessionpracticend/gameicons/0.jpg
 images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility1.jpg
 images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility2.jpg
 images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility3.jpg
@@ -21,6 +45,14 @@ images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage +
 images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.mp4
 images/characters/shared/headshots_generic/'+lover_picrand+'.jpg
 images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg
+images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', rand(0,1))+'.jpg
+images/locations/city/citycenter/nightclub/mentoilet.jpg
+images/locations/city/citycenter/nightclub/toiletwalkway.jpg
+images/locations/city/citycenter/nightclub/womentoilet.jpg
+images/locations/city/citycenter/photo/fashion4.mp4
+images/locations/city/island/university/campus/events/night/cold/1nakedg_coed_group1.jpg
+images/locations/city/island/university/campus/events/night/cold/2girl_butt_flash1.jpg
+images/locations/city/island/university/campus/events/night/cold/upsidedown_titflash.jpg
 images/locations/city/redlight/studio_porn/blonde_2.jpg
 images/locations/city/redlight/studio_porn/blonde_3.jpg
 images/locations/city/redlight/studio_porn/blonde_4.jpg
@@ -80,6 +112,8 @@ images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup0.'+mitkapicrand+'.
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup1.'+mitkapicrand+'.jpg
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoral0.'+mitkapicrand+'.jpg
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoralcum0.'+mitkapicrand+'.jpg
+images/locations/highway/sex/hj(1).mp4
+images/locations/pav/school/girls/katja/uni/katja_lickg.jpg
 images/locations/pavlovsk/pharmacy/apteka_worker_'+pav_pharma_picrand+'.jpg
 images/locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg
 images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/rolchat00.jpg
@@ -114,6 +148,14 @@ images/locations/pavlovsk/resident/apartment/aptrolan/done.jpg
 images/locations/pavlovsk/resident/apartment/natbelapt/touch_belly'+iif(npc_pregtalk['A16'] = 1,'_preg','')+'.jpg
 images/locations/pavlovsk/resident/meynolds/sex/vika_beach11.jpg
 images/locations/pavlovsk/resident/meynolds/tamara_tea' + zz_stage + '.jpg
+images/locations/pavlovsk/resident/pavlovhome/bathroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/bedroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/hallway.jpg
+images/locations/pavlovsk/resident/pavlovhome/kitchen.jpg
+images/locations/pavlovsk/resident/pavlovhome/livingroom.jpg
+images/locations/pavlovsk/resident/pavlovhome/spareroom.jpg
+images/locations/shared/brothel/placeholder.jpg
+images/locations/shared/brothel/placeholder.mp4
 images/pc/activities/flashing/dress/inside/bra/' + rand(1,dress_ind_bra) + '.jpg
 images/pc/activities/flashing/dress/inside/butt/' + rand(1,dress_ind_butt) + '.jpg
 images/pc/activities/flashing/dress/inside/full/' + rand(1,dress_ind_full) + '.jpg
@@ -164,39 +206,13 @@ images/qwest/alter/boiler/boilerroom1.jpg
 images/qwest/alter/boiler/boilerroom2.jpg
 images/qwest/alter/boiler/boilerroom3.jpg
 images/shared/misc/signature.jpg
+images/shared/sex/69/pre1.jpg
+images/shared/sex/after/wakeup_shock1.mp4
+images/shared/sex/after/wakeup_shock2.mp4
+images/shared/sex/after/wakeup1.jpg
+images/shared/sex/vag/cowgirl/blood1.jpg
+images/shared/sex/vag/doggy/blood1.jpg
+images/shared/sex/vag/miss/blood_condom1.jpg
+images/shared/sex/vag/miss/blood1.jpg
 images/system/icons/status/hair_'+pcs_hairbsh+'.png
 images/system/icons/status/makeup_'+pcs_makeup+'.png
-images/locations/pavlovsk/resident/pavlovhome/hallway.jpg
-images/locations/pavlovsk/resident/pavlovhome/bedroom.jpg
-images/locations/pavlovsk/resident/pavlovhome/kitchen.jpg
-images/locations/pavlovsk/resident/pavlovhome/livingroom.jpg
-images/locations/pavlovsk/resident/pavlovhome/bathroom.jpg
-images/locations/pavlovsk/resident/pavlovhome/spareroom.jpg
-images/characters/pavlovsk/resident/Anna/sessionpracticend/gameicons/0.jpg
-images/beast/zoo/rimma14.jpg
-images/beast/zoo/rimmabj.jpg
-images/beast/zoo/rimma21.jpg
-images/beast/zoo/rimma20.jpg
-images/beast/zoo/rimma19.jpg
-images/beast/zoo/rimma18.jpg
-images/beast/zoo/rimma17.jpg
-images/beast/zoo/rimma16.jpg
-images/beast/zoo/rimma15.jpg
-images/beast/zoo/rimma13.jpg
-images/beast/zoo/rimma12.jpg
-images/beast/zoo/rimma11.jpg
-images/beast/zoo/rimma10.jpg
-images/beast/zoo/rimma9.jpg
-images/beast/zoo/rimma8.jpg
-images/beast/zoo/rimma7.jpg
-images/beast/zoo/rimma6.jpg
-images/beast/zoo/rimma5.jpg
-images/beast/zoo/rimma4.jpg
-images/beast/zoo/rimma3.jpg
-images/beast/zoo/rimma2.jpg
-images/beast/zoo/rimma.jpg
-images/beast/zoo/primer.jpg
-images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', rand(0,1))+'.jpg
-images/locations/shared/brothel/placeholder.jpg
-images/locations/shared/brothel/placeholder.mp4
-images/locations/highway/sex/hj(1).mp4

locations/katja_uni.qsrc

@@ -714,7 +714,7 @@ if $ARGS[0] = 'batroom_panty_check':
 		if katjaQW['slut'] >= 100:
 			gs 'panties', 'remove'
 			katjaQW['horny'] += 10
-			'<center><img <<$set_imgh>> src="images/locations/pav/school/girls/katja/uni/katja_lickg.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/katja_lickg.jpg"></center>'
 			'Katja gets in close and squats down in front of you. She then '+iif(CloSkirtShortness = 0, 'unzips your pants and pulls them down, getting you to step out of them. Next, she grabs your panties and they also come off. ', 'lifts your skirt and pulls your panties off. ')+'Instead of getting up, she moves her face closer to your pussy and starts gently licking it.'
 			gs 'arousal', 'cuni', 1
 			gs 'willpower', 'foreplay', 'resist', 'medium'

missing_pictures.txt

@@ -1,12 +1,12 @@
-images/locations/city/citycenter/photo/fashion4.mp4
-images/locations/city/citycenter/nightclub/toiletwalkway.jpg
-images/locations/city/citycenter/nightclub/mentoilet.jpg
-images/locations/city/citycenter/nightclub/womentoilet.jpg
-images/shared/sex/vag/miss/blood_condom1.jpg
-images/shared/sex/vag/miss/blood1.jpg
-images/shared/sex/vag/doggy/blood1.jpg
-images/shared/sex/vag/cowgirl/blood1.jpg
-images/shared/sex/after/wakeup_shock1.mp4
-images/shared/sex/after/wakeup_shock2.mp4
-images/shared/sex/after/wakeup1.jpg
+images/characters/shared/headshots_main/254.jpg
+images/characters/shared/headshots_main/255.jpg
+images/characters/shared/headshots_main/256.jpg
+images/characters/shared/headshots_main/242.jpg
+images/characters/shared/headshots_main/243.jpg
+images/characters/shared/headshots_main/244.jpg
+images/characters/shared/headshots_main/245.jpg
+images/characters/shared/headshots_main/246.jpg
+images/locations/city/shared/metro/station/sex/fuck'+ metrorand['rand'] +'.jpg
+images/characters/pavlovsk/school/girl/KH.jpg
+images/characters/pavlovsk/school/girl/katja/uni/dorm/first_kiss.jpg
 ('Number of images not found: ', 11)