Merge remote-tracking branch 'upstream/master'

locations/fit.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'start':
 	*nl
 	'This modern and well staffed fitness center provides all the latest equipment and trainers to help you make the most of them.'
 	*nl
+	'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
+	*nl
 	'At the reception you may buy '+iif(abonement > 0, 'a subscription package', 'an additional subscription package')+' for access to all available facilities.'
 	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'

locations/therapist.qsrc

@@ -1812,19 +1812,19 @@ if $ARGS[0] = 'hypnoRandom':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		*nl
 
-		'<br><font color="<<$hypnocolour>>">"Okay, cunt. "He begins, setting up a new command;'
+		'<font color="<<$hypnocolour>>">"Okay, cunt. "He begins, setting up a new command;'
 
 		'"The only clothing you will be allowed to wear from now on are see-through items. If you do not already have any in your closet, you will need to buy some. My daughter works in promotions for a store in town. You can usually find her in the park whenever she is out." '
 
 		'He adjusts his shirt, then adds...'
 
-		'"Lastly, if they do not have any school clothes, wear an outfit that exposes the most skin," he smiles. "Wearing normal clothing makes you feel self-conscious -- like to much clothing restricts your movement. You need to wear the bare minimum, Understand cunt?"'
+		'"Lastly, if they do not have any school clothes, wear an outfit that exposes the most skin," he smiles. "Wearing normal clothing makes you feel self-conscious -- like to much clothing restricts your movement. You need to wear the bare minimum,</font> Understand cunt?"'
 		'"Yes, <i>Master</i>."'
-		'"Good ..."<br>'
+		'"Good ..."'
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
-	! sveta now thinks it''s normal for pavlov to touch her innapropriatly
+	! sveta now thinks it''s normal for pavlov to touch her inappropriately
 	elseif hypnoTouchWhenever ! 1 and rand(1,2) = 1:
 		cla
 		*clr