Merge branch 'master' of Lusticon/glife into master

[fixed] couple of bugs

locations/exercise.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = 'manual':
 	menu_off = 0
 	cla
 	act 'Return':gt 'exercise', 'workout'
-	if pcs_energy < 20 and pcs_stam < stammax / 5:
+	if pcs_energy < 20 or pcs_stam < stammax / 5:
 		'You don''t have the energy/stamina to work out anymore now.'
 	else
 		act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'

locations/korrPar.qsrc

@@ -36,7 +36,7 @@ gs 'courtletter'
 
 if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
-if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
+if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 > daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':