Merge branch 'feature/bugFixes' into 'dev'

Fix to the `Named NPC Genders` setting not working

See merge request !3051

game/base-system/settings.twee

@@ -645,6 +645,7 @@
 		<<set $feats.pregnancySillyLocked to true>>
 	<</if>>
 	<<updatehistorycontrols>>
+	<<presets _namedNpcPreset "save">>
 	<<initnpcgender>>
 	<<updatePersistentNPCs>>
 	<<hirsuteHideCheck>>
@@ -805,6 +806,7 @@
 
 			<div class="settingsToggleItem">
 				<span class="gold">Named NPC Genders</span>
+				<mouse class="tooltip linkBlue">(?)<span>Setting applies as you save changes.</span></mouse>
 				<br>
 				<<if _namedNpcPreset is undefined>><<set _namedNpcPreset to "namedNpcDefaultGender">><</if>>
 				<label>All Male <<radiobutton "_namedNpcPreset" "namedNpcAllMaleGender" autocheck>></label> |