Merge remote-tracking branch 'Kevin/master'

locations/Komp.qsrc

@@ -81,8 +81,8 @@ if $ARGS[0] = 'browse':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
-		'You go to your favourite start page, while you try to decide on what you want to see right now.'
-
+		if access['general-text'] = 1: '<center><h4 style="color: red;"><b><<$access[''general-text'']>></b></h4></center>'
+		'You go to your favourite start page, while you try to decide on what you want to see right now.'		
 		'A blinking banner for a <a href="exec: gt ''komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
 
 		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out': gt 'komp', 'sale'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'porno':
 		act '<B>Close the browser</B>': gt 'komp','start'
 	elseif access['noporn'] = 1:
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
-		'<<$access[''noporn-message'']>>'
+		'<<$access[''noporn'']>>'
 
 		act 'Leave this website': gt 'komp', 'browse'
 	else
@@ -645,7 +645,7 @@ if $ARGS[0] = 'mfc':
 		gs 'internet_mobile', 'use_internet', $subs, 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
-		'<<$access[''nocamshow-message'']>>'
+		'<<$access[''nocamshow'']>>'
 		act 'Leave this website': gt 'komp','browse'
 	else
 		act 'Go to your MFC homepage':

locations/bedrPar.qsrc

@@ -272,8 +272,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 			if sisboytrio = 0: access['noporn'] = 1
 			access['nocamshow'] = 1
-			$access['noporn-message'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
-			$access['nocamshow-message'] ='You can''t do any webcam activities with your sister in the room!'
+			$access['noporn'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
+			$access['nocamshow'] ='You can''t do any webcam activities with your sister in the room!'
 		else
 			gs 'music_actions', 'clear_restrictions'
 		end

locations/booty_call_shower.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = 'before_together2':
 		end
 	else
 		*nl
-		'<<$npc_firstname[$boy]>>''s hand runs down your belly to your pussy, spreading your lips, and you can feel his hardon between your thighs, threatening to penetrate you.'ç
+		'<<$npc_firstname[$boy]>>''s hand runs down your belly to your pussy, spreading your lips, and you can feel his hardon between your thighs, threatening to penetrate you.'
 !! temporary action until alternative is available
 		act'Blow him':gt'booty_call_shower', 'before_bj1'
 !!		act'Blow him instead':

locations/internet_mobile.qsrc

@@ -221,8 +221,8 @@ if $ARGS[0] = 'get_access':
                 k += 1
             if k < count: jump 'loop_args'
         end
-        if access['noporn'] = 1: $access['noporn-text'] = 'You can''t search for porn on this computer'
-        if access['nocamshow'] = 1: $access['nocamshow-text'] = 'You can''t do a cam show in this place'
+        if access['noporn'] = 1: $access['noporn'] = 'You can''t search for porn on this computer'
+        if access['nocamshow'] = 1: $access['nocamshow'] = 'You can''t do a cam show in this place'
         killvar 'count' & killvar 'k'
     end  
     killvar 'subsname'  

locations/pav_library.qsrc

@@ -13,7 +13,7 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 'For such a small town, the library is surprisingly large - containing many interesting books on a wide variety of subjects.'
 *nl
-'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''get_access'', ''free'', ''noporn'',''nocamshow''  & gt ''Komp'',''start''">computers</a> for public use.'
+'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''get_access'', ''free'', ''noporn'',''nocamshow'' & gs ''internet_mobile'', ''add_limitation'', ''general-text'', ''On this public computer all adult content sites are blocked'' & gt ''Komp'',''start''">computers</a> for public use.'
 if lernHome > 0:
 'You could do your homework with the help of one of the computers.'
 end

locations/pav_parkev.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'walk2':
 	menu_off = 1
 	pcs_mood += 10
 	gs 'stat'
-	if daystage = 2 or daystage = 3 and (month=1 or month=2 or month=12):
+	if (daystage = 2 or daystage = 3) and (month=1 or month=2 or month=12):
 	!!day winter
 		temprand = rand(1,13)
 		if temprand = 1:

locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 8
-version_patch = 5
+version_patch = 6
 --- saveg ---------------------------------
 

locations/shop.qsrc

@@ -607,7 +607,7 @@ if $shoplocation = 'megafon':
 	elseif home['internet_enabled'] = 0:
 		$line = '<tr><td align="center">You can''t buy an internet subscription for <<$home[''display'']>></td></tr>'
 	elseif subscription[$home['current']] = 1:
-		$line = '<tr><td align="center">You have an active internet subscription at <<$home[''display'']>> that will renew next month on day <<subscription[''<<$home[''current'']>>-date'']>> for <<price>> <b>₽</b></td></tr>'
+		$line = '<tr><td align="center">You have an active internet subscription at <<$home[''display'']>> that will renew next month on day <<subscription[''<<home[''current'']>>-date'']>> for <<price>> <b>₽</b></td></tr>'
 	else
 		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly internet subscription for <<price>><b>₽</b> at your <<$home[''display'']>>. Automatically renews every month</td>'
 		if bankAccount = 0:

locations/uni_dorm.qsrc

@@ -452,8 +452,8 @@ if $ARGS[0] = 'dorm_room':
 		if vika_inroom = 1:
 			acces['noporn'] = 1
 			access['nocamshow'] = 1
-			$access['noporn-message'] = 'You shouldn''t watch porn with Vika in the room!'
-			$access['nocamshow-message'] ='You can''t do any webcam shows with Vika in the room!'
+			$access['noporn'] = 'You shouldn''t watch porn with Vika in the room!'
+			$access['nocamshow'] ='You can''t do any webcam shows with Vika in the room!'
 		end
 		'Your <a href="exec:gt ''Komp'',''start''">computer</a> sits on your desk.'
 	end