Merge remote-tracking branch 'Violet_Kitten/master'

# Conflicts:
#	locations/train.qsrc

locations/foto_shoot.qsrc

@@ -506,7 +506,6 @@ if $ARGS[0] = 'bikini':
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
-	minut += 120
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50:inhib_exp += rand(0,1)
 	gs 'stat'