Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife

locations/JuliaMilHome.qsrc

@@ -20,7 +20,11 @@ if lernHome ! 0:
 		menu_off = 1
 		minut += 60
 		!npc_rel['A14'] += 10
-		lernHome = 0
+		if lernHome > 1:
+			lernHome -= 2
+		else
+			lernHome = 0
+		end
 		lern += rand(3, 6)
 		intel_exp += rand(1, 2) + (mentats_dose - rand(0,mentats_dose))
 		gs 'stat'

locations/artemEv.qsrc

@@ -93,7 +93,11 @@ if $ARGS[0] = 'learn':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'You spend an hour doing your homework together with Artem. He''s a very smart guy, and explains several things to you. At the end of the hour, you feel like you had a very productive homework session, and that you learned a lot from Artem''s tutoring.'
 	minut += 60
-	lernHome = 0
+	if lernHome > 1:
+		lernHome -= 2
+	else
+		lernHome = 0
+	end
 	lern += rand(3, 6)
 !!counts as doing 2 hours of homework alone
 	intel_exp += rand(1, 2)

locations/gschool_lessons4.qsrc

@@ -1452,7 +1452,7 @@ if $ARGS[0] = 'long_shower':
 							'She walks up to you and then turns you till you are facing the lockers and gives your butt a slap and then a squeeze. "What a dirty girl you are, what ever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 							gs 'arousal', 'foreplay', 2
 							gs 'stat'
-							act 'Give in': gt 'gschool_sex', 'ablina_lockerroom'
+							act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
 							gs 'willpower', 'sex', 'resist', 'medium'
 							if will_cost <= pcs_willpwr:
 								act 'Pull away (<<will_cost>> Willpower)':