Merge branch 'Salon-fixes' into 'pregmod-master'

Salon fixes

Closes #2621

See merge request !8520

src/facilities/salon/salonPassage.js

@@ -30,6 +30,7 @@ App.UI.salon = function(slave, cheat = false) {
 		}
 		el.append(hair());
 		el.append(makeup());
+		el.append(nails());
 		el.append(skin());
 		el.append(bodyHair());
 		return el;
@@ -145,6 +146,32 @@ App.UI.salon = function(slave, cheat = false) {
 		return el;
 	}
 
+	function nails() {
+		const el = new DocumentFragment();
+		App.UI.DOM.appendNewElement("h3", el, "Nails");
+		const options = new App.UI.OptionsGroup();
+
+		options.addOption(App.Desc.nails(slave), "nails", slave)
+			.addValue("Neatly clipped", 0, billMod)
+			.addValue("Long and elegant", 1, billMod)
+			.addValue("Sharp and claw-like", 3, billMod)
+			.addValue("Bright and glittery", 4, billMod)
+			.addValue("Very long and garish", 4, billMod)
+			.addValue("Color-coordinate with hair", 2, billMod);
+
+		options.addOption("", "makeup", slave)
+			.addValue("Neon", 6, billMod)
+			.addValue("Neon, color-coordinate with hair", 7, billMod);
+
+		options.addOption("", "makeup", slave)
+			.addValue("Metallic", 8, billMod)
+			.addValue("Metallic, color-coordinate with hair", 9, billMod);
+
+		el.append(options.render());
+
+		return el;
+	}
+
 	function hair() {
 		const el = new DocumentFragment();
 		let option;
@@ -440,7 +467,7 @@ App.UI.salon = function(slave, cheat = false) {
 		option = options.addOption(r.join(" "), "pubicHColor", slave);
 		if (hasPubes) {
 			if (slave.pubicHColor !== slave.hColor) {
-				option.addValue("Match the curtains", slave.pubicHColor);
+				option.addValue("Match the curtains", slave.hColor);
 			}
 			option.addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value)))
 				.addCallbackToEach(billMod)