Merge remote-tracking branch 'Anya/master'

# Conflicts:
#	locations/pav_disco_jocks.qsrc

locations/family.qsrc

@@ -111,7 +111,11 @@ if StoryLine = 1:
 
 			if sdadloc = 10:
 				ocpd_room = 1
-				'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
+				if momloc = 19:
+					''
+				else
+					'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
+				end
 			end
 		end
 

locations/pav_disco_jocks.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'lazar':
 				'You nod your head and join the group dancing.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				if hour >= 20:
-					act 'Keep dancing': gt 'pav_disco_coolkids', 'lazar_dance'
+					act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
 				end
 			elseif grupTipe = 5:
 				'He laughs as you get close. "Get lost loser." he scoffs before turning his back on you.'