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

locations/budgetclothes.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'gm_server':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'gm_outfits'
+	gs 'clothing', 'totals', 'gm_server'
 
 	act 'Return':
 		cla

locations/city_center.qsrc

@@ -49,7 +49,7 @@ end
 
 gs 'street_event','city_center', 'extras'
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and $ARGS[1] ! 'mom_check' and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

locations/city_residential.qsrc

@@ -53,7 +53,7 @@ if gopdeath = 1 and vsehsdaladay ! daystart:
 	gt 'gameover'
 end
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

locations/pav_complex.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pav_complex'', ''garages''">garages</a> and storage space for tenants.'
 
-	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 		gs 'mother_chats', 'reconciliation_talk'
 	exit
 	end

locations/pav_market.qsrc

@@ -41,7 +41,7 @@ end
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''pav_hotel''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

locations/pushkin_sq.qsrc

@@ -59,7 +59,7 @@ else
 	'The old theatre that houses a burlesque club is closed now. It is open every day 18:00 - 23:00'
 end
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

locations/sentence.qsrc

@@ -550,7 +550,7 @@ if $ARGS[0] = 'punishment':
 	killvar 'temp_fine'
 	killvar 'policeQW_courthearing_dates', 0
 	killvar '$policeQW_courthearing_subjects', 0
-	act 'Leave the court': gt 'city_center'
+	act 'Leave the court': gt 'city_center', 'mom_check'
 end
 
 
@@ -616,7 +616,7 @@ if $ARGS[0] = 'police_arrest2':
 	killvar 'policeQW_courtletter_dates', 0
 	killvar 'policeQW_courtletter_subjects', 0
 
-	act 'Leave the court': gt 'city_center'
+	act 'Leave the court': gt 'city_center', 'mom_check'
 end
 
 

locations/uni_grounds.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 		gs 'mother_chats', 'reconciliation_talk'
 	exit
 	end