Merge remote-tracking branch 'origin/master'

locations/Cum_Manage.qsrc

@@ -506,7 +506,7 @@ if $ARGS[0] = 'cumeater_icon':
 	*nl
 	j = 0
 	:cumeater_icon_jump
-		if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatVars['enema'] = 1): gs 'cum_manage', 'cumeater', j
+		if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatVars['enema'] = 1) and FUNC('Cum_Manage', 'check_private', j) = 1: gs 'cum_manage', 'cumeater', j
 	if j < 17: j += 1 & jump 'cumeater_icon_jump'
 end
 

locations/gdksport.qsrc

@@ -273,7 +273,7 @@ if $ARGS[0] = 'dance2':
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further, it is still good exercise.'
 
 		act 'Leave':
-			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
+			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )) and year = 2016:
 				if $start_type['cat'] = 'dancer':
 					gt 'albina_starlets', 'albina3'
 				elseif (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 60:

locations/stat_display.qsrc

@@ -1258,13 +1258,17 @@ if cheatStatusIcons = 0:
 
 	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = <<set_siconht>> src="images/system/icons/status/visible_cum.png"></a></td>'
 
-	if pcs_traits['cumeater'] = 1 and cheatVars['no_trait_cumeater'] = 0:
-		if stat_cumloc_check = 1 and menu_off = 0:
-			$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-		elseif stat_cumloc_check = 1 and menu_off = 1:
+	if pcs_traits['cumeater'] = 1 and cheatVars['no_trait_cumeater'] = 0 and $stat_cum_msg ! '' and $stat_cum_msg ! 'Your mouth has the tangy aftertaste of sperm.':
+		if menu_off = 1:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-		elseif stat_cumloc_check = 2:
-			$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+		else
+			if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or  cumloc[11] > 0 or cumloc[13] > 0 or  cumloc[14] > 0 or cumloc[16] > 0:
+				$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) :
+				$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			else
+				$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			end
 		end
 	end