Merge remote-tracking branch 'hornguy6/master'

locations/foto_models.qsrc

@@ -1449,10 +1449,10 @@ end
 
 
 if $ARGS[0] = 'krystal1':
-	if krystal['talk'] = 2:gt 'foto_models','krystal2'
-	if krystal['talk'] = 3:gt 'foto_models','krystal3'
-	if krystal['talk'] = 4:gt 'foto_models','krystal4'
-	if krystal['talk'] = 5:gt 'foto_models','krystal5'
+	if krystal['status'] = 2:gt 'foto_models','krystal2'
+	if krystal['status'] = 3:gt 'foto_models','krystal3'
+	if krystal['status'] = 4:gt 'foto_models','krystal4'
+	if krystal['status'] = 5:gt 'foto_models','krystal5'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'Walking by one of the sets you hear the photographer exclaim, "Yeah, that''s exactly what I was looking for. It''s always a pleasure working with you Katherine. You always seem to outdo yourself with every shoot."'
@@ -1489,7 +1489,7 @@ if $ARGS[0] = 'krystal1':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting/6.jpg"></center>'
 							'You say your farewells and watch her work for a few more minutes. If nothing else, she certainly has no shame.'
-							krystal['talk'] = 2
+							krystal['status'] = 2
 							act'Leave':gt 'foto','studio'
 						end
 					end
@@ -1500,7 +1500,7 @@ if $ARGS[0] = 'krystal1':
 end
 
 if $ARGS[0] = 'krystal2':
-	krystal['talk'] = 3
+	krystal['status'] = 3
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/1.jpg"></center>'
 	'As you walk through the studio, something catches your eye and you see that Krystal is waving you over. She''s wearing a blue top and panties, so she must be getting ready for a shoot.'
@@ -1933,7 +1933,7 @@ if $ARGS[0] = 'krystal3':
 				'"Alright," she says. The dress is starting to be pulled off both shoulders now. "Just thought I''d ask. You never know!"'
 				*nl
 				'As you walk away, you hear her moaning more and more. Just before you get out of earshot you hear her say, "We have to be careful this time Ben. Someone was angry when they found cum on the last set we used. I don''t want to get in trouble if they catch us this time!"'
-				krystal['talk'] = 4
+				krystal['status'] = 4
 				act'Leave':gt 'foto','studio'
 			end
 			act'"Maybe another time"':
@@ -1943,7 +1943,7 @@ if $ARGS[0] = 'krystal3':
 				'"Alrighty, catch you later then," she says with a wink as her dress starts to get pulled off.'
 				*nl
 				'As you walk away, you hear her moaning more and more. Just before you get out of earshot you hear her say, "We have to be careful this time Ben. Someone was angry when they found cum on the last set we used. I don''t want to get in trouble if they catch us this time!"'
-				krystal['talk'] = 4
+				krystal['status'] = 4
 				act'Leave':gt 'foto','studio'
 			end
 		end
@@ -1952,7 +1952,7 @@ end
 
 if $ARGS[0] = 'krystal4':
 	*clr & cla
-	krystal['talk'] = rand(4,5)
+	krystal['status'] = rand(4,5)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/1.jpg"></center>'
 	'"Hey babe!"'
 	'While walking around the studio, you hear someone call out to you. When you turn around, you see Krystal sitting on a sofa looking expectantly at you.'
@@ -1971,7 +1971,7 @@ end
 
 if $ARGS[0] = 'krystal5':
 	*clr & cla
-	krystal['talk'] = rand(4,5)
+	krystal['status'] = rand(4,5)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/busy.jpg"></center>'
 	'You''re looking for Krystal when you find her on set. She''s holding her legs open and you are being treated with a very explicit view of her pussy and asshole.'
 	'"Is this wide enough for you?" she calls over to the photographer who is changing settings on his camera.'

locations/foto_shoot.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'model':
 		
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
-			modelfoto['shoots']+= 1
+			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)
@@ -69,7 +69,7 @@ if $ARGS[0] = 'model':
 		end
 		act'Swimsuits':
 			$modelfoto['shoot_type'] = 'swim_catalog'
-			modelfoto['shoots']+= 1
+			modelfoto['shoots'] += 1
 			modelfoto['catalog'] += 1
 			model_job_week += 1
 			mdlng_exp += rand(2,5)

locations/street_event.qsrc

@@ -1867,6 +1867,8 @@ if $ARGS[0] = 'vaginal_rape':
 				end
 			end
 			act'Go to the police station':
+				minut += rand(30,60)
+				gs'stat'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 				if $loc = 'pav_commercial' or $loc = 'pav_residential':
@@ -1878,6 +1880,8 @@ if $ARGS[0] = 'vaginal_rape':
 			end
 			
 			act'Don''t go':
+				minut += 2
+				gs'stat'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 				'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'

locations/telefon.qsrc

@@ -1716,14 +1716,14 @@ if $ARGS[0] = 'show_sms':
 		$telefon['body'] += '<TR><TD colspan="2"><img src="<<$SMSPicture4[telefon[''SMSid'']]>>"></TD></TR>'
 	end
 	$telefon['body'] += '</TABLE><br>'
-	$telefon['backButton'] = 'gs ''telefon'', ''Phone_sms'''
+	$telefon['backButton'] = 'gs ''telefon'', ''Phone_sms'' '
 	dynamic $telefon['print']
 end
 
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
 !{	
 	SMS Row in messages table
-	ARGS[0] = message id
+	ARGS[0] = message id 
 	$ARGS[1] = NPC icon
 	$ARGS[2] = NPC Nickname
 	$ARGS[3] = Time received