Merge remote-tracking branch 'Hornguy6/master'

locations/city_musicstore.qsrc

@@ -51,8 +51,9 @@ if $ARGS[0] = 'musicshop':
 					end
 				end
 				act 'Leave': 
-				if ml_boughtguitar > 0 or ml_boughtamp > 0:
-					gt 'city_musicstore', 'payandtakestuff'
+					if ml_boughtguitar > 0 or ml_boughtamp > 0:
+						gt 'city_musicstore', 'payandtakestuff'
+					end
 				end
 				gt 'torgcentr'
 			end

locations/girl.qsrc

@@ -24,6 +24,7 @@ if $ARGS[0] = 'details':
 	if lover_picrand = lover_picture[0] or lover_picrand = lover_picture[1] or lover_picrand = lover_picture[2]: jump 'girldetailsloop'
 
 	loverGenderTmp = 1
+	npc_gender[$npclastgenerated] = 1
 	silaVag = npc_sexskill[$npclastgenerated]
 	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
 	$boydesc = $npc_usedname[$npclastgenerated]

locations/lover.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'add':
 	bodyPref[i] = bodyPrefTmp
 	makePref[i] = makePrefTmp
 	IQPref[i] = IQPrefTmp
-	loverGender[i] = loverGenderTmp
+	loverGender[i] = npc_gender[$npclastsaved]
 
 	!! making sure lover has pronouns
 	gs 'pronouns', loverGender[i], 0