Merge remote-tracking branch 'upstream/master'

locations/mey_vika_events.qsrc

@@ -724,7 +724,7 @@ if $ARGS[0] = 'cafe_qw':
 				gs 'npc_relationship', 'modify', 'A15', 'like'
 				gs 'npc_relationship', 'modify', 'A165', 'like'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_org.jpg"></center>'
-				'You hastily say goodbye, wanting to get away. Vicky tries to say goodbye but she only manages to let out some quiet moans while Vanya begins speeding up. Seeing this you leave as quickly as you can. You turn around seeing them still at it, and right at the exit of the café a powerful orgasm hits you, making your legs tremble, barely keeping on your feet. You have to grab the railing of the porch of the café, just so you won''t fall over.'
+				'You hastily say goodbye, wanting to get away. Vicky tries to say goodbye but she only manages to let out some quiet moans while Vanya begins speeding up. Seeing this you leave as quickly as you can. You turn around seeing them still at it, and right at the exit of the café a powerful orgasm hits you, making your legs tremble, barely keeping on your feet. You have to grab the patio wall of the café, just so you won''t fall over.'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'voyeur_sex', 2, 'unknown'
 				gs 'arousal', 'end'

locations/sex_ev_sex.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'fuck_continue':
 			act'Keep going':gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.bored'
 		elseif sex_ev['fuck_enjoyment'] = -1:
 			$orgasm_or = 'no'
-			if $sex_ev['speed'] = 3:
+			if sex_ev['speed'] = 3:
 				act'Sob':sex_ev['fuck_pain'] = 4 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
 				act'Try to hold back tears':sex_ev['fuck_pain'] = 3 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''pos_speed'']>>.2'
 			else

locations/stat_display.qsrc

@@ -1050,7 +1050,7 @@ if cheatStatusIcons = 0:
 	
 	if menu_off = 0 and birth_control['remind_icon'] = 1:
 		if tabletki = 0 and pillsleft[ptype] = 0:
-			$statusIconBarTab += '<td><a href="exec:msg $stat_out_of_birth_control_msg''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg ''You are out of birth control pills!''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 		else
 			$statusIconBarTab += '<td><a href="exec:gs ''din_bad'', ''quick_takepill''"><img title="It''s time to take your birth control pill!" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 		end