Merge branch 'fix' into 'pregmod-master'

fixes

Closes #2293

See merge request pregmodfan/fc-pregmod!7805

src/gui/quicklinks.js

@@ -129,7 +129,7 @@ App.UI.quickMenu = (function() {
 		edicts: "Edicts",
 		Farmyard: () => App.Entity.facilities.farmyard.UIName,
 		"Find Slave": "Locate Slave",
-		Firebase: () => `${capFirstChar(V.SF.Lower)}'s Firebase`,
+		Firebase: () => `${capFirstChar(V.SF.Lower || "No one")}'s Firebase`,
 		"Future Society": "Future Societies",
 		"Head Girl Suite": () => App.Entity.facilities.headGirlSuite.UIName,
 		Incubator: () => App.Entity.facilities.incubator.UIName,

src/npc/startingGirls/startingGirls.tw

@@ -637,7 +637,7 @@
 	.addValue("None", 0)>>
 
 	<<run _options.addOption("Nipples", "nipples", $activeSlave)
-	.addValueList([["Tiny", "tiny"], ["Cute", "cute"], ["Puffy", "puffy"], ["Inverted", "inverted"], ["Huge", "huge"]])>>
+	.addValueList([["Tiny", "tiny"], ["Cute", "cute"], ["Puffy", "puffy"], ["Partially Inverted", "partially inverted"], ["Inverted", "inverted"], ["Huge", "huge"]])>>
 
 	<<run _options.addOption("Areolae", "areolae", $activeSlave)
 	.addValueList([["Normal", 0], ["Large", 1], ["Wide", 2], ["Huge", 3], ["Massive", 4]])>>
@@ -692,7 +692,7 @@
 		<</if>>
 
 		<<run _options.addOption("Labia", "labia", $activeSlave)
-		.addValueList([["Normal", 0], ["Large", 1], ["Huge", 2]])>>
+		.addValueList([["Normal", 0], ["Large", 1], ["Huge", 2], ["Huge Dangling", 3])>>
 
 		<<run _options.addOption("Vaginal wetness", "vaginaLube", $activeSlave)
 		.addValueList([["Dry", 0], ["Normal", 1], ["Excessive", 2]])>>
@@ -766,6 +766,13 @@
 					V.activeSlave.pregSource = 0;
 					V.activeSlave.pregWeek = 0;
 					V.activeSlave.pregKnown = 0;
+				}).addValue("Contraceptives", -1, () => {
+					V.activeSlave.pregType = 0;
+					V.activeSlave.belly = 0;
+					V.activeSlave.bellyPreg = 0;
+					V.activeSlave.pregSource = 0;
+					V.activeSlave.pregWeek = 0;
+					V.activeSlave.pregKnown = 0;
 				}).addValue("Barren", -2, () => {
 					V.activeSlave.pregType = 0;
 					V.activeSlave.belly = 0;

src/uncategorized/multiImplant.tw

@@ -22,7 +22,7 @@ that are ready be sent down.
 	<<set _sortedOrgans = _F.getSortedOrgans(getSlave($AS))>>
 	<<if _sortedOrgans.length === 0>><<continue>><</if>>
 
-	<h2>getSlave($AS).slaveName</h2>
+	<h2><<= getSlave($AS).slaveName>></h2>
 
 	<<for _k = 0; _k < _sortedOrgans.length; _k++>>
 		<h3><<print _F.Organs[_sortedOrgans[_k]].name>></h3>