Merge branch 'master' of https://git.tfgames.site/hornguy6/glife

# Conflicts:
#	locations/gadukino.qsrc
#	locations/model_mari.qsrc

locations/booty_call_condoms.qsrc

@@ -1186,7 +1186,7 @@ if $ARGS[0] = 'npc_preg_react':
 end
 
 if $ARGS[0] = 'npc_no_condom_react':
-	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) < pcs_persuas):
+	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) > pcs_persuas):
 		booty_call['condom'] = 1
 		booty_call['npc_condom_insist'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
@@ -1208,7 +1208,7 @@ if $ARGS[0] = 'npc_no_condom_react':
 end
 
 if $ARGS[0] = 'npc_temp_no_condom_react':
-	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) < pcs_persuas):
+	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and (rand(npc_willpwr[$boy],100) - npc_rel[$boy]) > pcs_persuas):
 		booty_call['condom'] = 1
 		booty_call['npc_condom_insist'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'

locations/booty_call_start.qsrc

@@ -1048,7 +1048,8 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 					'"So that means you''ll swallow it all next time, right?"'
 					act'I''ll try':
 						cla & *nl
-						'"I''ll do my best," you say.'
+						'"I''ll do my best," you say, eyes still watering.'
+						gs 'booty_call_sex', 'sex_end'
 					end
 					act'Nod':
 						cla & *nl

locations/model_mari.qsrc

@@ -1121,7 +1121,6 @@ if $ARGS[0] = 'mari_first_nude':
 		if modelfoto['fullnude'] = 0:
 			gs'model_mari', 'mari_first_nude2'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading3.jpg"></center>'
 			gs'model_mari', 'pc_nude_debut_talk'
 		end
 	end