Merge pull request #455 from mekolat/headstyle-genderv2016.2.9

3rd gender, new races

1 files changed, 2 insertions, 6 deletions

diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index 7345b535..fafa17ef 100644
--- a/world/map/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
@@ -7,9 +7,6 @@
 
 027-2,22,76,0|script|Thurstan|318
 {
-    if (Sex == 0) set @madamsir$, "Madam";
-    if (Sex == 1) set @madamsir$, "Sir";
-
     set @Graveyard_Inn_MASK, NIBBLE_6_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_6_SHIFT;
 
@@ -39,14 +36,14 @@
     if (BaseLevel < 85)
         goto L_greet;
     mes "[Headless Man]";
-    mes "\"Hello " + @madamsir$ + ". My name is Thurstan. Could I ask your assistance with something? I seem to be in a spot of difficulty.\"";
+    mes "\"Hello. My name is Thurstan. Could I ask your assistance with something? I seem to be in a spot of difficulty.\"";
     menu
         "I'll listen, just keep that thing from dripping on me.", L_Quest_ask,
         "Ack, a bloody talking head!  Gross, no way!", L_Close;
 
 L_greet:
     mes "[Headless Man]";
-    mes "\"Greetings " + @madamsir$ + "!  Do you have any duck tape?\"";
+    mes "\"Greetings!  Do you have any duck tape?\"";
     goto L_Close;
 
 L_Quest_ask:
@@ -189,7 +186,6 @@ L_Final:
 
 L_Close:
 
-    set @madamsir$, "";
     set @Graveyard_Inn_MASK, 0;
     set @Graveyard_Inn_SHIFT, 0;
     set @state, 0;