Merge remote-tracking branch 'upstream/master'

locations/city_center.qsrc

@@ -197,9 +197,9 @@ end
 if hour >= 8 and hour <= 18:
 	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a> and <a href="exec: minut += 1 & gt ''city_hermitage'', ''start''">Hermitage Museum</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a><a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
+	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a> and <a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>>, <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 1 & gt ''sentence'',''start''">The City Courthouse</a>'

locations/city_clinic.qsrc

@@ -421,14 +421,14 @@ if $ARGS[0] = 'stdclinic':
 		if money < 450 and karta < 450: *nl & 'You can''t afford your herpes shot.'
 
 		if money >= 450:
-			act 'Get herpes shot (1,000 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
+			act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
 				money -= 450
 				gs 'city_clinic', 'herpes_shot'
 			end
 		end
 
 		if karta >= 450:
-			act 'Get herpes shot (1,000 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
+			act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
 				karta -= 450
 				gs 'city_clinic', 'herpes_shot'
 			end

locations/katja_city_sex.qsrc

@@ -749,7 +749,7 @@ end
 if $ARGS[0] = 'going_home':
 	minut += 10
 	$location_type = 'public_outdoors'
-
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/walking_home_at_night.jpg"></center>'
 	'You leave his apartment and walk out into the streets, heading in the direction of the nearest metro station.'
 	if katjaQW['QWstage'] = 5:
 		katjaQW['QWstage'] = 6

locations/wardrobe.qsrc

@@ -893,7 +893,7 @@ if $ARGS[0] = 'default_sport_options':
 		else
 			if $pantyworntype = $defpantytype[default_sport_number] and pantywornnumber = defpantynumber[default_sport_number] and $braworntype = $defbratype[default_sport_number] and brawornnumber = defbranumber[default_sport_number]: default_sport_number[2] += 1
 		end
-		if $shoeworntype = $defshoegtype[default_sport_number] and shoewornnumber = defshoenumber[default_sport_number]: default_sport_number[2] += 1
+		if $shoeworntype = $defshoetype[default_sport_number] and shoewornnumber = defshoenumber[default_sport_number]: default_sport_number[2] += 1
 		if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
 		if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1