Merge remote-tracking branch 'slanon/master'

locations/LCwork.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'start4':
 
 				gs 'arousal', 'anal', 20, 'sub', 'prostitution'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'anal', $boy
+				gs 'cum_call', 'anus', $boy
 				gs 'stat'
 				
 				act 'Leave their apartment building':money += randLCpay & gt 'city_residential'

locations/cum_call.qsrc

@@ -5,6 +5,8 @@
 'arms' - 'face' - 'mouth' - 'hands' - 'stomach' - 'breasts' - 'hair' - 'internalcondom' - 'precum' - 'mouth_swallow'
 	'precum' - is for whenever Sveta has unprotected vaginal sex. It will automatically set the volume to 1.
 	'mouth_swallow' does the same as mouth but increaments swallow for the cum eater trait
+	'feet' redirects to 'legs'
+	'anal' redirects to 'anus' (prevents further errors)
 $ARGS[1] is for the name of the sexual partner
 ARGS[2] is a for knowing the partner. Defaults to 0. If this is not set to 1 the status window message will mention "some guy" instead of his name.
 	0 - unknown sex partner (his name may be known, but she newer saw him before, and likely won't ever again, or she won't remeber it)
@@ -88,6 +90,8 @@ if $ARGS[0] ! 'precum':
 		spafinloc = 2
 	elseif $ARGS[0] = 'anus':
 		spafinloc = 3
+	elseif $ARGS[0] = 'anal':
+		spafinloc = 3
 	elseif $ARGS[0] = 'butt':
 		spafinloc = 4
 	elseif $ARGS[0] = 'pantyrear':
@@ -100,6 +104,8 @@ if $ARGS[0] ! 'precum':
 		spafinloc = 8
 	elseif $ARGS[0] = 'legs':
 		spafinloc = 9
+	elseif $ARGS[0] = 'feet':
+		spafinloc = 9
 	elseif $ARGS[0] = 'arms':
 		spafinloc = 10
 	elseif $ARGS[0] = 'face':

locations/gschool_boys_bathroom.qsrc

@@ -297,7 +297,7 @@ if $ARGS[0] = 'boy2_sub':
 			gs 'stat'
 			act 'Finish':
 				*clr & cla
-				gs 'cum_call', 'anal', $boy
+				gs 'cum_call', 'anus', $boy
 				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
@@ -948,7 +948,7 @@ if $ARGS[0] = 'boy6_sub':
 						gs 'cum_call', 'labia', $boy, 1, '', '', 8
 						gs 'cum_call', 'butt', $boy, 1, '', '', 8
 						gs 'cum_call', 'face', $boy, 1, '', '', 8
-						gs 'cum_call', 'breast', $boy, 1, '', '', 8
+						gs 'cum_call', 'breasts', $boy, 1, '', '', 8
 						gs 'cum_call', 'hair', $boy, 1, '', '', 8
 						bathroomindex += 1
 						if bathroomindex < 3: