improve handling of lastname

src/events/intro/pcAppearance.js

@@ -65,17 +65,18 @@ App.UI.Player.names = function(options) {
 
 	if (V.cheatMode) {
 		options.addOption("Birth Name", "birthName", V.PC).showTextBox();
-		options.addOption("Surname", "slaveSurname", V.PC).showTextBox();
-		options.addOption("Birth Surname", "birthSurname", V.PC).showTextBox();
+	}
+
+	if (V.PC.slaveSurname === 0) {
+		options.addOption("And no surname", "slaveSurname", V.PC)
+			.addValue("Add a surname", "Anon")
+			.addComment("Surnames cannot be changed during the game outside of special circumstances.");
 	} else {
-		if (V.PC.slaveSurname === 0) {
-			options.addOption("And no surname", "slaveSurname", V.PC)
-				.addValue("Add a surname", "Anon")
-				.addComment("Surnames cannot be changed during the game outside of special circumstances.");
-		} else {
-			options.addOption("And your surname is", "slaveSurname", V.PC).showTextBox()
-				.addValue("Go by a single name", 0)
-				.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+		options.addOption("And your surname is", "slaveSurname", V.PC).showTextBox()
+			.addValue("Go by a single name", 0)
+			.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+		if (V.cheatMode) {
+			options.addOption("Birth Surname", "birthSurname", V.PC).showTextBox();
 		}
 	}
 };