Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/city_apt_building.qsrc

@@ -173,12 +173,12 @@ if $ARGS[0] = 'roof':
 			gt 'city_apt_building','roof'
 		end
 	end
-	if temper >= 15 and hour >= 8 and hour <= 20:
+	if temper >= 15 and daystage < 5 and sunWeather = 1:
 		if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
 		if pcs_inhib > 30:
-			act 'Sunbath naked':
+			act 'Sunbathe naked':
 				*clr & cla
 				minut += 60
 				inhib_exp += rand(3,5)

locations/father.qsrc

@@ -451,7 +451,8 @@ if (hour > 10 and week < 6) or week >= 6:
 
                             if fatherLust = 1:
                                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim43.jpg"></center>' & 'You run your hands over your shoulders and slide the straps off to the side, pretending it is an accident. "Oh no, I can be so clumsy sometimes!" you exclaim, while taking way longer than you need to put them back where they need to be. All the while your stepfather''s eyes are glued to your <<$titsize>> breasts, and his face turns beet red.'
-                                if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the sun. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
+                                if $pantyworntype = 'none' and daystage < 5:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the sun. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
+								if $pantyworntype = 'none' and daystage >= 5:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim44.jpg"></center>' & 'You''re not wearing any panties today, and decide to tease your stepfather with it. Moving over to the window you reach for the curtains and begin to rustle them, while the contours of your body are illuminated by the streetlights. Your clothes are so thin, your stepfather can clearly see the outline of your bare pussy through the semi-transparent clothes. You turn to face him and innocently say "Oh I''m sorry Daddy, I didn''t mean to disturb you. Should I go?" It takes him a few seconds to nod, but his greedy look tells you there are a lot of things he would want to do to you right here, right now.'
                             end
                             act 'Move away':gt $loc, $loc_arg
                         end

locations/katja_uni.qsrc

@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'studying_exam':
 	
 	gs 'stat'
 	
-	killvar modifier
+	killvar 'modifier'
 	killvar 'study_mod'
 	
 	act 'Say goodbye to Katja and leave the library':

locations/nerd_game_night.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'keep_playing_on1':
 	'The battle with the dragon begins and Feofan weaves a scary sounding battle as everyone takes turns taking an action. At one point, most of the group is down, with only Julia and Petka''s characters still up. Julia is trying to heal Zinaida and Artem''s characters, while Petka''s sorceress is trying to cast a powerful spell. It looks like the dragon is about to finish them off, but you''ve managed to sneak around behind the dragon while it focuses on the rest of the party. At this point, you decide to try out your back stab ability Feofan told you about. "I want to back stab the dragon."'
 	'Feofan looks surprised at first. "You have to be behi... Oh." He looks at the figures on the map and notices your rogue directly behind the dragon.'
 	'"Yes!" Artem exclaims and several of the others acknowledge what you''ve done, which makes you feel good about yourself, even if it is over a game.'
-	'Feofan nods with a smile. "Okay then. Roll your attack, <<$pcs_nickname>>.'
+	'Feofan nods with a smile. "Okay then. Roll your attack, <<$pcs_nickname>>."'
 	act 'Roll the dice':
 		*clr & cla
 		temp = rand(1,20)
@@ -361,7 +361,7 @@ if $ARGS[0] = 'game_night3':
 					'You cautiously enter the blacksmith shop. "I''m not interested in what you have to say, girl!" The familiar clanking sound starts all over again.'
 					'"I-I..." you start hesitating, losing some of your composure as Feofan is a really good role-player. You suddenly feel a light nudge on your arm. "Say that you want to roll the dice for a persuasion check." Julia reminds you.'
 					'You look towards Feofan. "I would like to roll the dice for a persuasion check!"'
-					'"Are you sure about that?" Feofan teases, knowing you''re not that experienced when it comes to role-playing. The others nod in encouragement. "Yes, I''m sure!'
+					'"Are you sure about that?" Feofan teases, knowing you''re not that experienced when it comes to role-playing. The others nod in encouragement. "Yes, I''m sure!"'
 					'Feofan smiles. "Great, then roll the dice!"'
 					act 'Roll the dice':
 						*clr & cla
@@ -589,7 +589,7 @@ if $ARGS[0] = 'group':
 			grupvalue[3] -= 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/taverngroup.jpg"></center>'
-			'"You shake your head. "That''s way too much! I politely decline."'
+			'You shake your head. "That''s way too much! I politely decline."'
 			'"Too bad then... Leave us alone, we''re done here!" You can clearly tell that he''s annoyed.'
 			'The others sigh as you return to the group, discontent with your decision.'
 			if nerd_game['tavernwoman'] = 0: act 'Talk to the woman': gt 'nerd_game_night', 'woman'

locations/therapist.qsrc

@@ -33,8 +33,12 @@ if $ARGS[0] = '':
 	therapistday = daystart
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/room.jpg"></center>'
-	'"Come in, Miss <<$pcs_lastname>>! Please, tell me what can I help you with today?"'
-	'You step into the office of <a href="exec:dynamic $pavlov">Dr. Pavlov</a>, who greets you in with a warm smile and a firm handshake.'
+	'Stepping into the office of <a href="exec:dynamic $pavlov">Dr. Pavlov</a>, you are welcomed with a warm smile and a firm handshake by the doctor.
+
+	When you look around the room, you are greeted by a warm and inviting atmosphere. The room is illuminated by large windows that overlook the forest beyond. At one end of the room there is a desk with a chair stacked with folders and books pertaining to hypnotherapy and other therapy materials. This includes a laptop that is closed and appears clean, as if it has been seldom used. You see an older photograph of Dr. Pavlov''s family?in which he appears to be about two decades younger.
+	
+	"Come in, Miss <<$pcs_lastname>>! Please, tell me what I can help you with today?"'
+	
 	'As you look about the room, it has the appearance of a study; warm and inviting. Large windows face out to the forest beyond. There is a desk with a chair at one end of the room covered in folders and books about Hypnotherapy and other therapy materials, including a laptop. It is currently closed and looks clean, though seldom used. You see an older <a href="exec: VIEW ''images/locations/pavlovsk/clinic/therapist/pavlovfamily.jpg''">photograph of Dr. Pavlov''s family</a> in which he appears to be about two decades younger.'
 	gs 'stat'
 	gs 'therapist', 'hypnoGreet'