1 files changed, 21 insertions, 9 deletions

diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 9827f388..e8d41a6a 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -113,11 +113,11 @@ function	script	BarberChangeColor	{
 }
 
 function	script	BarberChangeBodyType	{
-    mesn("Note");
-    mes(b(l("Changing your body type will send you back to the character selection screen.")));
+    mesn l("Note");
+    mes b(l("Changing your body type will send you back to the character selection screen."));
     next();
 
-    mes(l("Please select the desired body type:"));
+    mes l("Please select the desired body type:");
     menuint(
         rif(BodyType == BODYTYPE_1, "► ") + l("Body type %i", 1), BODYTYPE_1,
         rif(BodyType == BODYTYPE_2, "► ") + l("Body type %i", 2), BODYTYPE_2,
@@ -134,13 +134,17 @@ function	script	BarberChangeBodyType	{
     close;
 }
 
-// THIS FUNCTION SHOULD BE USED ONLY AT REBIRTH
-// Unless current game development design changes!
 function	script	BarberChangeRace	{
 
     mes l("What's your race?");
+    mesc l("WARNING: Changing race may have side effects.");
     menuint
-        l("Talpan"), Human;
+        l("Talpan"), Talpan,
+        l("Tritan"), Tritan,
+        l("Ifriton"), Ifriton,
+        rif(is_dev(), l("Gispaan")), Gispaan,
+        rif(is_dev(), l("Sparron")), Sparron,
+        rif(countitem(SkeletonCharm), l("Undead")), Skellie;
 
     mes "";
 
@@ -171,6 +175,7 @@ function	script	Barber	{
             l("I'd like to get a different style."),
             l("Can you do something with my color?"),
             l("How about changing my body type?"),
+            rif(BaseLevel > 70, l("I would like to change my species.")),
             l("I'm fine for now, thank you.");
 
         switch (@menu)
@@ -179,13 +184,13 @@ function	script	Barber	{
             BarberSayStyle();
             break;
         case 2:
-            BarberChangeStyle;
+            BarberChangeStyle();
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Enjoy your new style."),
                 l("Anything else?");
             break;
         case 3:
-            BarberChangeColor;
+            BarberChangeColor();
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I hope you like this color."),
                 l("Anything else?");
@@ -197,10 +202,17 @@ function	script	Barber	{
                 l("Anything else?");
             break;
         case 5:
+            BarberChangeRace();
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("This service is provided with no warranties on regards of side effects."),
+                l("Anything else?");
+            break;
+            break;
+        case 6:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Feel free to come visit me another time.");
-
             goodbye;
+            return;
         }
     } while (true);
     return;