Merge remote-tracking branch 'Netuttki/master'

# Conflicts:
#	locations/music_actions.qsrc

locations/HotelRoom.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'normal':
 	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'internet_mobile', 'get_access', 'free'
-
+	gs 'music_actions', 'clear_restrictions'
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
@@ -24,7 +24,7 @@ if $ARGS[0] = 'normal':
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 
 	*nl
 	act'Go to the hotel lobby':
@@ -64,6 +64,8 @@ if $ARGS[0] = 'better':
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	gs 'internet_mobile', 'get_access', 'free'
+	gs 'music_actions', 'clear_restrictions'
+
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
@@ -71,7 +73,7 @@ if $ARGS[0] = 'better':
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -110,6 +112,8 @@ if $ARGS[0] = 'best':
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	gs 'internet_mobile', 'get_access', 'free'
+	gs 'music_actions', 'clear_restrictions'
+
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
@@ -117,7 +121,7 @@ if $ARGS[0] = 'best':
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -158,6 +162,7 @@ if $ARGS[0] = 'therapist':
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	gs 'internet_mobile', 'get_access', 'free'
+	gs 'music_actions', 'clear_restrictions'
 
 	'<center><b><font color = maroon>Your husband''s hotel room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/room.jpg"></center>'
@@ -165,7 +170,7 @@ if $ARGS[0] = 'therapist':
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':

locations/bedr.qsrc

@@ -8,6 +8,7 @@ $locclass = 'bedr'
 $location_type = 'private'
 gs 'themes', 'indoors'
 gs 'stat'
+gs 'music_actions', 'clear_restrictions'
 
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 '<center><b><font color="maroon">Bedroom</font></b></center>'
@@ -38,7 +39,6 @@ if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your b
 *nl
 act 'Go to the corridor': gt 'korr'
 
-gs 'music_actions', 'clear_restrictions'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your drunken husband sleeps on the bed with a butt plug up his ass.'
 	if husbanstrapon = 2:'Your drunken husband sleeps on the bed after you put a dildo up his ass.'
@@ -210,7 +210,7 @@ gs 'subkid'
 act 'Relax on your bed': gt 'bed', 'start'
 act 'Open wardrobe': gt 'wardrobe', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 --- bedr ---------------------------------
 

locations/bedr2x.qsrc

@@ -15,6 +15,7 @@ minut += 1
 elektro += 1
 gs 'stat'
 gs 'themes', 'indoors'
+gs 'music_actions', 'clear_restrictions'
 
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 *nl
@@ -33,7 +34,6 @@ if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your b
 act 'Go to the corridor': gt 'korr2x'
 gs 'wardrobe', 'default_clothing_options'
 
-gs 'music_actions', 'clear_restrictions'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk after you used an anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk after you stuck a dildo in his ass.'
@@ -200,7 +200,7 @@ gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 --- bedr2x ---------------------------------
 

locations/bedrPar.qsrc

@@ -14,6 +14,7 @@ gs 'stat'
 gs 'family_schedule'
 !! ballet career
 gs 'core_library', 'init'
+gs 'music_actions', 'clear_restrictions'
 
 !! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
@@ -282,7 +283,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Computer, music and internet use.
-			gs 'music_actions', 'clear_restrictions'
 			gs 'internet_mobile', 'get_access'
 			if locat['Anya_inroom'] = 1:
 				gs 'music_actions', 'not_alone'
@@ -310,7 +310,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'</td></tr></table>'
 
 		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
-		gs 'music_actions', 'music_icon'
+		gs 'music_actions', 'start'
 	end
 end
 

locations/city_center.qsrc

@@ -21,6 +21,7 @@ if sound = 0:
 end
 
 gs 'stat'
+gs 'music_actions', 'clear_restrictions'
 
 !call random events from [street_events], and display them before show location.
 if streetevent_hour ! hour: gt 'street_event','city_center', 'main'
@@ -97,7 +98,7 @@ if shantpopala > 0:
 	exit
 end
 
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 
 if car > 0 and cardrive = 2:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> sits in the parking lot.'

locations/city_house_res_bedr.qsrc

@@ -14,6 +14,7 @@ if $ARGS[0] = 'bedro':
 	menu_off = 0
 	minut += 1
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	
 	*clr & cla
 	'<center><b><font color="maroon">Bedroom</font></b></center>'
@@ -26,7 +27,7 @@ if $ARGS[0] = 'bedro':
 	if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
 	
 	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	*nl
 	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
 	*nl

locations/city_house_res_misc.qsrc

@@ -136,6 +136,7 @@ if $ARGS[0] = 'livroom':
 	menu_off = 0
 	minut += 1
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	
 	*clr & cla
 	'<center><b><font color="maroon">Living Room</font></b></center>'
@@ -160,7 +161,7 @@ if $ARGS[0] = 'livroom':
 	gs 'subkid'
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 
 	if mc_inventory['sewing_kit'] = 1:
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'

locations/city_mansion_residence_2.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'yliving':
 	menu_off = 0
 	minut += 1
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	
 	*clr & cla
 	'<center><b><font color="maroon">Living Room</font></b></center>'
@@ -27,7 +28,7 @@ if $ARGS[0] = 'yliving':
 		'A large room where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
 		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'
 		gs 'subkid'
-		gs 'music_actions', 'music_icon'
+		gs 'music_actions', 'start'
 	end
 end
 
@@ -256,6 +257,7 @@ if $ARGS[0] = 'yoffice':
 	menu_off = 0
 	minut += 1
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	
 	*clr & cla
 	'<center><b><font color="maroon">Office</font></b></center>'
@@ -276,7 +278,7 @@ if $ARGS[0] = 'yoffice':
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique <a href="exec:gt ''stol'', ''start''">desk</a>.'
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 		
 	end
 end

locations/city_park.qsrc

@@ -19,6 +19,7 @@ if $ARGS[0] = 'start':
 	end
 
 	$sexloc = 'city_park'
+	gs 'music_actions', 'clear_restrictions'
 
 	if WalkInsidePark = 0:WalkInsidePark = 1
 	*clr & cla
@@ -185,7 +186,7 @@ if $ARGS[0] = 'start':
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 
 	if hour <= 7 or hour >= 21:
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success

locations/dachain.qsrc

@@ -14,6 +14,8 @@ if $args[0] = 'start':
 	gs 'themes', 'indoors'
 	*clr & cla
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
+
 	'<center><b><font color="maroon">Cottage</font></b></center>'
 	if func('homes_properties', 'is_property_renovated'):
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dacharoom2.jpg"></center>'
@@ -60,7 +62,7 @@ if $args[0] = 'start':
 !!-------------------------------------------------------------------------------------------------------------------------------------
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	
 end
 

locations/gadsarai.qsrc

@@ -308,6 +308,8 @@ if $ARGS[0] = 'barn_room':
 	gs 'themes', 'indoors'
     gs 'stat'
 	gs 'core_library', 'stage_title'
+	gs 'music_actions', 'clear_restrictions'
+
 	act '<b>Leave and go to the yard</b>':
 		if $clothingworntype ! 'nude':
 			minut += 5
@@ -337,7 +339,7 @@ if $ARGS[0] = 'barn_room':
 	end
 	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
 	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	!! Activities End
 	!! TODO: if winter create task for chopping wood for log stove.
 	!! act 'light log stove': gt  'gadsarai', 'log_stove' 

locations/mey_home.qsrc

@@ -245,6 +245,7 @@ if $ARGS[0] = 'guest_bedroom':
 	$menu_arg = 'guest_bedroom'
 	menu_off = 0
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	'<center><h4><font color="maroon">Guest room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	*nl
@@ -274,7 +275,7 @@ if $ARGS[0] = 'guest_bedroom':
 	end
 
 	gs 'exercise', 'start'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
 	if mc_inventory['mag_porn'] > 0:
 		'You hide your porn magazines under the mattress of your bed.'

locations/music_actions.qsrc

@@ -1,38 +1,39 @@
 #music_actions
 
-if $ARGS[0] = 'music_icon':
+
+if $ARGS[0] = 'start':
     !! Everywhere
     ml_time_left = ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
-    if alko > 5:
+    !! Will move but too many changes for a
+    if ml_activities['enabled'] = 0 and (ml_guitar['hasguitar'] or vokal_lvl > 5): 
+        ml_activities['enabled'] = 1
+    end
+
+    if alko > 5 and ml_activities['enabled'] = 1:
         '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
     !! the library, or at the church, etc. 
-    else
-        if ($location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15)) and ml_no_music = 1: killvar 'ml_no_music'
-
-        if ml_no_music = 0:
-            if hour < 8: 
-                '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.'
-            else
-                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
+    elseif ($location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15)) and ml_no_music = 0 and ml_activities['enabled'] = 1:
+        if hour < 8: 
+            '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.'
+        else
+            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'', ''available_actions''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
                 else
-                    act 'Available musical activities': gs 'music_actions', 'start'
+                    pl '<center><a href="exec: gs ''music_actions'', ''available_actions''"><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', 'available_actions'
             end
-            if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
         end
+        if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
-
-if $ARGS[0] = 'start': 
+if $ARGS[0] = 'available_actions': 
     cla
     ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if $location_type = 'public_outdoors': 
@@ -42,30 +43,26 @@ if $ARGS[0] = 'start':
         killvar 'access'
     end
     
-    if ml_not_alone ! 0: gs 'music_actions', 'willpower_cost'
     if $access = '': gs 'internet_mobile', 'get_access'
 
     !! $location_type = ''private'' = these are usually homes. ''indoors'' usually an office, shop or an NPC''s home. Same for ''public_indoors'' For those locations
     !! anything music related should be part of a storyline/quest, or some prewritten scene, like in the room of Anushka
     gs 'music_actions', 'play_something'
     gs 'music_actions', 'practice_guitar'
-    
+
     if $location_type = 'public_outdoors': gs 'music_actions', 'busking'
     gs 'music_actions', 'record_music'
-    gs 'music_actions', 'stream_music'
+    
 
-    !! NOTE: When content gates are added
-    !!if ml_activities['setlist'] = 1: gs 'music_actions', 'rehearse_gig'
-    !!if ml_activities['busking'] = 1: gs 'music_actions', 'busking'
-    !!if ml_activities['streaming'] = 1: gs 'music_actions', 'stream_music'
-    !! if this is done outdoors, any editing, mixing must be dones at home. So 'Record and edit' is not available outdoors.
+    !! if this is done outdoors, any editing, mixing must be done at home. So 'Record and edit' is not available outdoors.
     !! Although more accurate would be to check whether Sveta is at home or not, and if she is not home then that option won''t be available.
-    !!if ml_activities['recording'] = 1: gs 'music_actions', 'record_music'
-
-    if $access ! 'denied': gs 'music_actions', 'set_up_account'
-    !! if $access ! 'denied': gs 'music_actions', 'upload_music'
-    gs 'music_actions', 'delete_music'
-
+    
+    if $access ! 'denied': 
+        gs 'music_actions', 'stream_music'
+        gs 'music_actions', 'set_up_account'
+        !! gs 'music_actions', 'upload_music'
+        gs 'music_actions', 'delete_music'
+    end
     act 'Finish': gs 'music_actions', 'finish'
 end
 
@@ -207,6 +204,7 @@ if $ARGS[0] = 'stream_music':
     elseif ml_time_left < 60:
         act 'Live stream (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to play a whole stream.</font>'    
     else
+        gs 'music_actions', 'willpower_cost'
         if will_cost = 0:
             act 'Live stream (60 minutes)': gt 'music_onlinemusic', 'live_stream'
         elseif will_cost  <= pcs_willpwr:
@@ -230,22 +228,25 @@ end
 !! click a hundred times to do something. Boring.  
 !! 4. Computer based recording is removed for now, some changes are needed
 if $ARGS[0] = 'record_music':
-    !! Recording music
+    !! Recording music    
     if ml_performance['max_perform_minutes'] < 30:
         act 'Record a song (<font color="red">You are not able to play for half an hour yet.</font>)': '<br><font color="red">You don''t have the endurance yet to play for half an hour continuously.</font>'
     elseif ml_time_left < 30:
         act 'Record a song (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to record anything right now.</font>'    
-    elseif will_cost = 0:
+    else
+        gs 'music_actions', 'willpower_cost'
+        if will_cost = 0:
             act 'Record a song with your phone (30 minutes)': gt 'music_onlinemusic', 'record_song'
-    elseif will_cost  <= pcs_willpwr:
-        act 'Record a song with your phone (30 minutes) (<<will_cost>> Willpower' + iif(ml_not_alone, ' - you are not alone)', ')'):
-            inhib_exp += rand(1,2)
-            gs 'willpower', 'pay', 'self'
-            gs 'stat'
-            gt 'music_onlinemusic', 'record_song'
+        elseif will_cost  <= pcs_willpwr:
+            act 'Record a song with your phone (30 minutes) (<<will_cost>> Willpower' + iif(ml_not_alone, ' - you are not alone)', ')'):
+                inhib_exp += rand(1,2)
+                gs 'willpower', 'pay', 'self'
+                gs 'stat'
+                gt 'music_onlinemusic', 'record_song'
+            end
+        else
+            act 'Record a song (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You don''t feel comfortable recording in front of other people right now.</font>'
         end
-    else
-        act 'Record a song (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You don''t feel comfortable recording in front of other people right now.</font>'
     end
 end
 
@@ -344,7 +345,7 @@ if $ARGS[0] = 'finish':
     killvar 'will_cost'
     killvar 'ml_not_alone'
     killvar 'ml_no_music'
-    killvar 'ml_time_left'
+    killvar 'ml_time_left'    
     gt $loc, $loc_arg
 end
 

locations/nichBedroomServant.qsrc

@@ -23,6 +23,7 @@ end
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.
 if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	'<center><b>Your Bedroom in Nicholas'' Apartment</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
@@ -90,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 
 	gs 'events', 'read'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 	if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 
 	if sick >= 1:

locations/pav_commercial.qsrc

@@ -25,7 +25,7 @@ cla
 litltown = 1
 alkoblock = 0
 boynumBlock = 0
-
+gs 'music_actions', 'clear_restrictions'
 !call random events from [street_events], and display them before show location.
 if streetevent_hour + 2 < hour:gt'street_event','pav_commercial', 'main'
 
@@ -151,7 +151,7 @@ act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:25)':minut += 25 & gt 'pushkin'
 
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/pav_park.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'vicky_meynold_schedule'
 	gs 'Zvereva_schedule'
-
+	gs 'music_actions', 'clear_restrictions'
 	if sound = 0:
 		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
@@ -226,7 +226,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 
 	if month >= 6 and month <=8:
 		if (emp_job_status[1] = 0  or emp_job_status[1] = 4) and (work = 0 or cheatVars['work'] = 1):

locations/pav_shared_apt.qsrc

@@ -640,7 +640,7 @@ if $ARGS[0] = 'pcsRoom':
 	minut += 2
 	gs 'stat'
 	gs 'pav_shared_apt', 'update'
-
+	gs 'music_actions', 'clear_restrictions'
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/sofabed.jpg"></center>'
 	*nl
@@ -752,7 +752,7 @@ if $ARGS[0] = 'pcsRoom':
 
 	act 'Relax on your bed': gt 'bed', 'start'
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 end
 	
 if $ARGS[0] = 'sofabed':

locations/pushkin_sq.qsrc

@@ -6,7 +6,7 @@ $region = 'pushkin'
 $location_type = 'public_outdoors'
 menu_off = 0
 gs'stat'
-
+gs 'music_actions', 'clear_restrictions'
 '<center><B>Okhlopkov Square</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/liames.jpg" ></center>'
 'Okhlopkov Square serves as the main intersection of several smaller streets.'  
@@ -117,7 +117,7 @@ if rand(1,100) >= 95:
 	act 'Continue': gt'pushkin_sq'
 end
 
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 if hour >= 15 and hour <= 22 and tusa = 0:
 	act 'Go to the local hangout':

locations/sitr.qsrc

@@ -12,6 +12,7 @@ minut += 1
 elektro += 1
 gs 'stat'
 gs 'themes', 'indoors'
+gs 'music_actions', 'clear_restrictions'
 '<center><b><font color="maroon">Living room</font></b></center>'
 
 if remsitr = 0:
@@ -62,7 +63,6 @@ gs 'exercise', 'start'
 !!housegostrand = rand(1, 20)
 !!if husband > 0 and husbandrink ! 10 and week = 5 and hour > 17 and hour < 21 and housegostrand > 15: gt 'sitr', 'guest'
 
-gs 'music_actions', 'clear_restrictions'
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sitting on the couch, watching television.'
@@ -71,7 +71,7 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 end
 if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs 'music_actions', 'no_music'
 
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 act 'Go out on the balcony': gt 'balkon','start'
 

locations/sitr2x.qsrc

@@ -20,7 +20,7 @@ elektro = elektro + 1
 gs'stat'
 
 gs 'themes', 'indoors'
-
+gs 'music_actions', 'clear_restrictions'
 '<center><b><font color = maroon>Hall</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
 
@@ -53,7 +53,6 @@ gs 'exercise', 'start'
 !housegostrand = rand(1,20)
 !if week = 5 and hour > 17 and hour < 21 and housegostrand > 15 and husband > 0 and husbandrink ! 10:gt'sitr2x','guest'
 
-gs 'music_actions', 'clear_restrictions'
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sitting on the couch watching television.'
@@ -62,7 +61,7 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 end
 if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs 'music_actions', 'no_music'
 
-gs 'music_actions', 'music_icon'
+gs 'music_actions', 'start'
 
 gs 'subkid'
 

locations/uni_dorm.qsrc

@@ -1007,6 +1007,7 @@ if $ARGS[0] = 'dorm_room':
 	gs 'themes', 'indoors'
 	minut += 1
 	gs 'stat'
+	gs 'music_actions', 'clear_restrictions'
 	*clr & cla
 	'<center><b>Your dorm room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_room/room.jpg"></center>'
@@ -1015,7 +1016,6 @@ if $ARGS[0] = 'dorm_room':
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	if mc_inventory['mag_porn'] > 0: 'You''ve hidden your porn magazines under the mattress of your bed.'
 	
-	gs 'music_actions', 'clear_restrictions'
 	vika_inroom = 0 & vika_sleep = 0
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'dorm_room':
 	end
 	!! Removed the check to see if Sveta has access to the place as the check happens before Sveta reaches 
 	!! this location, at the "Go to your room" actions.
-	gs 'music_actions', 'music_icon'
+	gs 'music_actions', 'start'
 end
 
 --- uni_dorm ---------------------------------