Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/brother_voyeur.qsrc

@@ -577,8 +577,7 @@ if $ARGS[0] = 'brother_shower_together_ask':
 
 	act'Just close the latch':
 		*clr & cla
-		!!'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
-		'<center><img src="images/system/image_needed.png"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
 		'"Just close the latch! It''ll be fine!" you insist.'
 		'You can see he''s still conflicted, but in the end his baser instincts win and he starts to undress, unable to pass up an opportunity to shower with a female.'
 		act'Let him get in':gt'brother_voyeur','brother_shower_together_first'
@@ -591,8 +590,7 @@ if $ARGS[0] = 'brother_shower_together_ask':
 		'"I am not!" he says, his face starting to turn red.'
 		act'Prove it':
 			*clr & cla
-			!!'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
-			'<center><img src="images/system/image_needed.png"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
 			'"Prove it."'
 			'Your challenge can''t be passed up and Kolka practically starts throwing his clothes off to climb into the shower with you.'
 			act'Let him get in':gt'brother_voyeur','brother_shower_together_first'

locations/dinSex.qsrc

@@ -295,8 +295,13 @@ if $ARGS[0] = 'boy_wants_anal':
 	$bwa_boy = iif($ARGS[1] = '',$boydesc,$ARGS[1])
 	if $bwa_boy = 'lubri': $bwa_boy = $boydesc
 	if analplugin = 1:
-		'<<$bwa_boy>> pulls the plug out of your narrow and tight ass.'
-		analplugout = 1
+		if pcs_ass < 16:
+			'<<$bwa_boy>> pulls the plug out of your narrow and tight ass.'
+			analplugout = 1
+		else
+			'<<$bwa_boy>> pulls the plug out of your ass.'
+			analplugout = 1
+		end
 	end
 	if $ARGS[2] = 'lubri':
 		lubri +=1
@@ -325,9 +330,13 @@ if $ARGS[0] = 'girl_wants_anal':
 	$bwa_girl = iif($ARGS[1] = '',$boydesc,$ARGS[1])
 	if $bwa_girl = 'lubri': $bwa_girl = $boydesc
 	if analplugin = 1:
-		'<<$bwa_girl>> pulls the plug out of your narrow and tight ass.'
-		analplugin = 0
-		analplugout = 1
+		if pcs_ass < 16:
+			'<<$bwa_boy>> pulls the plug out of your narrow and tight ass.'
+			analplugout = 1
+		else
+			'<<$bwa_boy>> pulls the plug out of your ass.'
+			analplugout = 1
+		end
 	end
 	if $ARGS[2] = 'lubri':
 		lubri +=1

locations/lover.qsrc

@@ -1,6 +1,7 @@
 # lover
 
 if $ARGS[0] = 'add':
+	if mid($boy,1,1) = 'C': gs 'npcpreservec', $boy & gs 'boyStat', $npclastsaved
 	i = arrsize('pcs_lovers')
 	$lover[i] = $boy
 	$loverdesc[i] = $boydesc

locations/npccleanc.qsrc

@@ -97,6 +97,10 @@ $npc_dna[$tempcclean] = ''
 i = arrsize('$cemptyarray')
 $cemptyarray[i] = $tempcclean
 
+:clean_sanity_loop
+i = arrsize('$cemptyarray') 
+If i > 1 and $cemptyarray[0] = $cemptyarray[i]: killvar '$cemptyarray', i & jump 'clean_sanity_loop'
+
 killvar '$tempcclean'
 
 --- npccleanc ---------------------------------