Merge branch 'revert-20b80602' into 'pregmod-master'

Revert "Merge branch 'surname-fix' into 'pregmod-master'"

See merge request pregmodfan/fc-pregmod!7552

src/npc/descriptions/name.js

@@ -65,8 +65,7 @@ App.Desc.name = function(slave) {
 				} else if (slave.slaveSurname !== slave.birthSurname) {
 					r.push(`${slave.birthSurname}.`);
 				}
-			}
-			if (slave.slaveSurname === 0) {
+			} if (slave.slaveSurname === 0) {
 				r.push(`${He} has no surname as a slave, which ${he}`);
 				if (slave.devotion > 95) {
 					r.push(`loves.`);

src/npc/generate/heroCreator.js

@@ -101,11 +101,6 @@ App.Utils.getHeroSlave = function(heroSlave) {
 	// WombInit(heroSlave);
 	const newSlave = BaseSlave();
 	deepAssign(newSlave, heroSlave);
-
-	// Fix names, prevent "undefined" from being overwritten by 0
-	newSlave.slaveName = heroSlave.slaveName;
-	newSlave.slaveSurname = heroSlave.slaveSurname;
-
 	V.heroSlaveID = heroSlave.ID;
 	newSlave.ID = generateSlaveID();
 	repairLimbs(newSlave);