Merge remote-tracking branch 'upstream/master'

locations/alexandriaSex.qsrc

@@ -103,7 +103,7 @@ end
 
 if $ARGS[0] = 'grumpy1':
 	*clr & cla
-	$orgasm_or 'no'
+	$orgasm_or = 'no'
 	gs 'arousal', 'massage', 5, 'sub', 'lesbian'
 	gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 	gs 'stat'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'grumpy1':
 		act 'The torture continues':
 			*clr & cla
 			gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
-			$orgasm_or 'yes'
+			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_finger', 5, 'sub', 'lesbian', 'no_orgasm_msg'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G3.jpg"></center>'
 			'Finally, after who knows how long, Aleksei breaks away from you and stands up, looking down at you with a critical eye as he drags slowly on a cigarette, the silence eternalizing as you kneel before him.'

locations/gschool_socialchg.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'coolkid warn 1':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay?"'
 	'Before you can answer, Stasya chimes in. "You haven''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us?"'
-	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That's all we're saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
+	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That''s all we''re saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -462,7 +462,7 @@ if $ARGS[0] = 'coolkid outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don't care. I don't know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don''t care. I don''t know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 	'"Now you''re where you always belonged. With the other losers." he says before leaving as well. You hear the other students laughing as you look around. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 

locations/metro_events.qsrc

@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'twobbc':
 				gs 'arousal', 'foreplay', 3, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
-				'Leave':minut += 5 & gt $loc, $loc_arg
+				act 'Leave': minut += 5 & gt $loc, $loc_arg
 			end
 		else
 			act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/natbel_friend.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'go_to_del_greco':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
 		'You reach over, place your hand on hers, and gently squeeze it, leaving your hand holding hers. "I know; I just wanted to treat you. You mean a lot to me. Maybe we can do more like this in the future if you like?"'
-		'Natasha smiles, then after a moment, she looks around at the other people, after which she gently pulls her hand away. You can tell it made her uncomfortable, but she didn''t seem to mind it too much. "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that's when I've borrowed money, and I need to stop doing that as it keeps getting on top of me."'
+		'Natasha smiles, then after a moment, she looks around at the other people, after which she gently pulls her hand away. You can tell it made her uncomfortable, but she didn''t seem to mind it too much. "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that''s when I''ve borrowed money, and I need to stop doing that as it keeps getting on top of me."'
 		*nl
 		'Natasha continues, "You know, <<$pcs_nickname>>, this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also, sometime when I can just switch off."'
 		'You are a little confused and look at her quizzically. "Well, I don''t judge, but I like you. You are a good friend who is nice to me. That means a lot."'

locations/nichTanya.qsrc

@@ -488,7 +488,7 @@ if $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		else
-			killvar 'nichTanya['Date']'
+			gs 'shortgs', 'remove_array_element', 'nichTanya', 'Date'
 			killvar 'nichDateState'
 			gt 'nichBedroomTanja'
 		end
@@ -1080,7 +1080,9 @@ if $ARGS[0] = 'chat':
 			else
 				gt 'nichTanya', 'sexL'
 			end
-		gt $loc, 'return'
+		else
+			gt $loc, 'return'
+		end
 	end
 end
 

locations/nichUtil.qsrc

@@ -148,7 +148,7 @@ elseif $ARGS[0] = 'debug':
 	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 10   & gt ''nichUtil'', ''debug''">Casually dating</a>'
 	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 20   & gt ''nichUtil'', ''debug''">In a relationship</a>'
 	'You fucked Tanya <<nichTanya[''FuckCounter'']>> times'
-	'The last time you fucked Tanya was '+(daystart-nichTanya[''FuckLast''])+' days ago'
+	'The last time you fucked Tanya was '+(daystart-nichTanya['FuckLast'])+' days ago'
 	'Tanya has a dominance of <<nichTanya[''Dominance'']>> (range: -100 - 100)'
 	
 	act 'DEBUG: New Workday': gs 'nichUtil', 'startWorkday'

locations/pav_disco_sex.qsrc

@@ -2370,7 +2370,7 @@ end
 if $ARGS[0] = 'no drugs':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/hotel/leave.jpg"></center>'
-	'"There's no way I'm doing that! Who knows what that powder is? I don''t want to get raped. Have fun, loser."'
+	'"There''s no way I''m doing that! Who knows what that powder is? I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$npclastsaved]>> snorts deeply and looks over at you. "Too bad. You''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$npclastsaved]>> just shrugs his shoulders and jumps straight back into what he started.'
 	act 'Leave the room': gt 'pav_market'