Browse Source

Merge remote-tracking branch 'master/master'

anjuna krokus 2 weeks ago
parent
commit
81236e9a59
2 changed files with 9 additions and 10 deletions
  1. 3 2
      locations/nyp_school.qsrc
  2. 6 8
      locations/selfplay.qsrc

+ 3 - 2
locations/nyp_school.qsrc

@@ -312,7 +312,8 @@ if $ARGS[0] = 'cool jocks':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
 			'You shake your head and pull yourself free from her grasp. "I don''t feel like it right now. Maybe later?"'
 			'You shake your head and pull yourself free from her grasp. "I don''t feel like it right now. Maybe later?"'
 			'She pouts. "Aww, you''re no fun, <$pcs_nickname>>! If you change your mind, then come join us."'
 			'She pouts. "Aww, you''re no fun, <$pcs_nickname>>! If you change your mind, then come join us."'
-			'A few of the other girls join her on the dance floor and they all start dancing together. You watch them for a while before turning back to engage in conversation with the other girls.'
+			'A few of the other girls join her on the dance floor and they all start dancing together.'
+			'You watch them for a while before turning back to engage in conversation with the other girls.'
 
 
 			act 'Hang out until the party ends': gt 'nyp_school', 'end'
 			act 'Hang out until the party ends': gt 'nyp_school', 'end'
 		end
 		end
@@ -340,7 +341,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 			end
 		end
 		end
 
 
-!!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
+		!!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
 	else
 	else
 		*clr
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'

+ 6 - 8
locations/selfplay.qsrc

@@ -27,11 +27,11 @@ if $ARGS[0] = 'start':
 		if locat['Anya_inroom'] = 1: sis_watch = 2 & 'Anya smiles and lets you carry on.'
 		if locat['Anya_inroom'] = 1: sis_watch = 2 & 'Anya smiles and lets you carry on.'
 	end
 	end
 
 
-	!!then the calculation invasion
-	if $loc = 'vanrPar':
-		if selfplaytime >= 60:
-		end
-	end
+	!!then the calculation invasio
+	! if $loc = 'vanrPar':
+	! 	if selfplaytime >= 60:
+	! 	end
+	! end
 
 
 	gs 'selfplay', 'sis_prov'
 	gs 'selfplay', 'sis_prov'
 
 
@@ -1171,7 +1171,6 @@ if $ARGS[0] = 'self_fisting_1':
 	if org_temp = orgasm: gs 'selfplay', 'self_fisting_2'
 	if org_temp = orgasm: gs 'selfplay', 'self_fisting_2'
 
 
 	act 'Stop masturbating':gt 'selfplay', 'stop'
 	act 'Stop masturbating':gt 'selfplay', 'stop'
-	end
 end
 end
 
 
 if $ARGS[0] = 'self_fisting_2':
 if $ARGS[0] = 'self_fisting_2':
@@ -1246,8 +1245,7 @@ if $ARGS[0] = 'anal_fingering':
 		
 		
 		act 'Choose a different way to masturbate':gt 'selfplay', 'start'
 		act 'Choose a different way to masturbate':gt 'selfplay', 'start'
 		act 'Stop masturbating':gt 'selfplay', 'stop'
 		act 'Stop masturbating':gt 'selfplay', 'stop'
-		
-	end
+
 end
 end
 
 
 if $ARGS[0] = 'anal_fingering2':
 if $ARGS[0] = 'anal_fingering2':