Merge remote-tracking branch 'Hooded_Silence/master'

locations/salon.qsrc

@@ -5,13 +5,10 @@
 !! salon, cleanvar clears transitory variables.
 
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
-	cla & *clr
-	$menu_loc = 'salon'
-	$menu_arg = 'start'
-	$loc = 'salon'
-	$loc_arg = 'start'
 	menu_off = 0
+	cla & *clr
+	gs 'shortgs', 'setloc', 'salon', $ARGS[0]
+	$sexloc = 'salon'	
 	salonrand = rand(0, 9)
 	$location_type = 'public_indoors'
 	gs 'family_schedule'
@@ -69,7 +66,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'receptionist':
-	$loc_arg = 'receptionist'
+	gs 'shortgs', 'setloc', 'salon', $ARGS[0]
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
 	
@@ -198,16 +195,16 @@ if $ARGS[0] = 'services':
 	end
 	
 	gs 'salon', 'discount', 1000
-	if (pcs_pubes > 9 or pcs_leghair > 9) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+	if (pcs_pubes > 2 or pcs_leghair > 2) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
 		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':
 			gs 'salon', 'discount', 1000
 			gt'salon','hair_removal'
 		end
-	elseif (pcs_pubes > 9 or pcs_leghair > 9)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
+	elseif (pcs_pubes > 2 or pcs_leghair > 2)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough money for this!'
 		end
-	elseif pcs_pubes <= 9 and pcs_leghair <= 9:
+	elseif pcs_pubes <= 2 and pcs_leghair <= 2:
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough body hair for this procedure!'
 		end