Merge remote-tracking branch 'netuttki/master'

locations/Cheatmenu_din.qsrc

@@ -1100,7 +1100,7 @@ $cheatmenu['tatoo'] = {
 	if tatlip >= 1:'<a href="exec:tattCount-=1 & tatlip = 0 & dynamic $cheatmenu[''tatoo'']">Remove your lip tattoo</a>'
 	if tatneck = 0:'You do not have a tattoo on your neck</a>'
 	if tatneck >= 1:'<a href="exec:tattCount-=1 & tatneck = 0 & dynamic $cheatmenu[''tatoo'']">Remove your neck tattoo</a>'
-	if tatvag = 0:'You do not have a public tattoo</a>'
+	if tatvag = 0:'You do not have a pubic tattoo</a>'
 	if tatvag >= 1:'<a href="exec:tattCount-=1 & tatvag = 0 & dynamic $cheatmenu[''tatoo'']">Remove your pubic tattoo</a>'
 	if tatlech = 0:'You do not have a tattoo on your shoulder</a>'
 	if tatlech >= 1:'<a href="exec:tattCount-=1 & tatlech = 0 & dynamic $cheatmenu[''tatoo'']">Remove your shoulder tattoo</a>'

locations/music_actions.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'music_icon':
     !! Everywhere
+    ml_time_left = ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if alko > 5:
         'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
     !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
@@ -11,18 +12,24 @@ if $ARGS[0] = 'music_icon':
             'It''s too early to do anything noisy like playing the guitar or singing.'
         elseif hour > 22:
             'It''s too late to do anything noisy like playing the guitar or singing.'
-        elseif ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
         else
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+            if ml_settings['its_me'] = 1: 
+                if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+                else
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                end
+            else
+                act 'Available musical activities': gs 'music_actions', 'start'
+            end
         end
         if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
+
 if $ARGS[0] = 'start': 
     cla
-
     ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if $location_type = 'public_outdoors': 
         !! In public, Sveta is never alone

locations/pav_clinic.qsrc

@@ -156,16 +156,16 @@ if $ARGS[0] = '':
 				else
 					if pcs_missing_teeth = 1:
 						zubpay = 30000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to replace your tooth'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to replace your tooth'
 					elseif pcs_missing_teeth > 1:
 						zubpay = pcs_missing_teeth * 30000
-						'The dentist examines you and says, it will cost you <<pcs_missing_teeth * 30000>> <b>₽</b> to fill the gaps'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to fill the gaps'
 					elseif pcs_teeth = 0:
 						zubpay = 3000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to brighten and polish your teeth.'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to brighten and polish your teeth.'
 					elseif pcs_teeth > 0:
 						zubpay = 4500
-						'The dentist examinees you and says, it will cost you <<4500>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
+						'The dentist examinees you and says, it will cost you <<zubpay>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
 					end
 
 					if money < zubpay and karta < zubpay:
@@ -183,7 +183,7 @@ if $ARGS[0] = '':
 								elseif pcs_teeth > 0:
 									dentistday = daystart + 180
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to come back it six months to have it taken of.'
 								else
 									dentistday = daystart + 90
 									pcs_teeth = -1