Merge remote-tracking branch 'Lusticon/master'

locations/arousal.qsrc

@@ -172,8 +172,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			end
 		end
 	end
-	!!	This is to allow a Succubus with the right skill level to handle any size then go back to original size
-	if succubusflag = 1 and sucskill >= 4:
+	!!	This is to allow a Succubus with the right skill level or elastigirl trait to handle any size then go back to original size
+	if (succubusflag = 1 and sucskill >= 4) or pcs_traits['elastigirl'] > 0:
 		if mid($ARGS[0],1,4) = 'vagi' and temp_dick ! pcs_vag:
 			if temp_dick < pcs_vag - 5 or temp_dick > pcs_vag + 5: pcs_mood -= 10
 			if sucvagorg = 0: sucvagorg = pcs_vag

locations/din_van.qsrc

@@ -583,7 +583,7 @@ $quickwash = {
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/body/pee/wiping/no<<rand(3,4)>>.jpg"></center>'
-				'You spend minutes waiting between the sudden gushes of semen pouring out of your snatch.'
+				'You spend minutes waiting between the sudden gushes of semen pouring out of your.'
 
 				act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 			end
@@ -833,7 +833,7 @@ $basin = {
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/body/pee/wiping/no<<rand(3,4)>>.jpg"></center>'
-				'You spend minutes waiting between the sudden gushes of semen pouring out of your snatch.'
+				'You spend minutes waiting between the sudden gushes of semen pouring out of your.'
 
 				act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 			end

locations/mother.qsrc

@@ -288,7 +288,7 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if rape_day+7 > daystart:
+		if rape_count > 0 and rape_day+7 > daystart:
 			act 'Tell her about your rape':
 				gt 'mother_chats', 'rape_talk'
 			end

locations/pav_residential.qsrc

@@ -54,14 +54,17 @@ gs'street_event','pav_residential', 'extras'
 if flag_rape_1 = 1:
 	flag_rape_1 = 0
 	rape_count = rape
+	rape_day = daystart
 	'You stop under the dim light of a streetlight. Breathing heavy, you occasionally stop to wince from the pain coming from your pussy. You convince yourself not to tell anyone, and to just get home, clean up and go to bed as soon as possible. The sooner you do that, the sooner you can forget this ever happened.'
 elseif flag_rape_1 = 2:
 	flag_rape_1 = 0
 	rape_count = rape
+	rape_day = daystart
 	'Coming out of your daze, you find you''ve walked into the center of town without even realizing it. You feel a bit strange as you stop to think about why you aren''t upset about having been raped. Replaying the encounter in your head, you realize you actually enjoyed it a little. All in all, you''re not too worried about what happened.'
 elseif rape > rape_count:
 	!for normal rape. differ display with bimbolevel
 	rape_count = rape
+	rape_day = daystart
 	if bimbolevel > 2:
 		'You feel great after having sex, and don''t understand why they didn''t just ask. Silly man.'
 	elseif bimbolevel > 0:

locations/pav_station.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'reception':
 		act 'Walk away from the clerk': minut += 2 & gt 'pav_station', 'station_inside'
 	end
 
-	if rape_day+2 > daystart: act 'Report a rape': gt 'pav_station', 'rape_report'
+	if rape_count > 0 and rape_day+2 > daystart: act 'Report a rape': gt 'pav_station', 'rape_report'
 end
 
 temp_tot_booked_pav = policeQW['shoplift_booked_pav'] + policeQW['prostitution_booked_pav']

locations/police_station.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'reception':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
 	'Upon entering the station you''re welcomed by a reception desk. The officers sitting here are protected by thick glass and you see several monitors and computers keeping an eye on everything that''s happening inside and outside the building.'
 	
-	if rape_day+2 > daystart: act 'Report a rape': gt'police_station','rape_report'
+	if rape_count > 0 and rape_day+2 > daystart: act 'Report a rape': gt'police_station','rape_report'
 	act 'Return to the center': gt 'city_center'
 end