Browse Source

Merge remote-tracking branch 'hornguy6/master'

KevinSmarts 3 years ago
parent
commit
ad0a1837f5
1 changed files with 0 additions and 5 deletions
  1. 0 5
      locations/salon.qsrc

+ 0 - 5
locations/salon.qsrc

@@ -1156,8 +1156,6 @@ if $ARGS[0] = 'tanning_booth':
 	else
 		money -= 1000
 	end
-	if salonrand > 6 and npc_QW['A192'] > 2:gt 'etoexhib', 'pos1'
-	if salonrand = 0 and masha = 0:gt 'salon', '0'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solarium.jpg"></center>'
 	'You spend an hour naked in a tanning booth bronzing your skin.'
@@ -1179,7 +1177,6 @@ if $ARGS[0] = 'hair_removal':
 	else
 		money -= 2000
 	end
-	if salonrand = 0 and masha = 0:gt 'salon', '0'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/depilation.jpg"></center>'
 	'You get a full body hair removal treatment, giving you a smooth and completely hair free body.'
@@ -1197,7 +1194,6 @@ if $ARGS[0] = 'skin_care':
 		money -= 5000
 	end
 	gs 'body_shape', 'basebeautycalc', 1
-	if salonrand = 0 and masha = 0:gt 'salon', '0'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/facialmask.jpg"></center>'
 	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight.'
@@ -1215,7 +1211,6 @@ if $ARGS[0] = 'rejuvination':
 		money -= 25000
 	end
 	gs 'body_shape', 'basebeautycalc', 1
-	if salonrand = 0 and masha = 0:gt 'salon', '0'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/bodyscrub.jpg"></center>'
 	'You get a full body rejuvenation procedure, afterwards your skin feels soft and silky smooth.'