5 files changed, 8 insertions, 6 deletions
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 89779294..d3ab8713 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -6,7 +6,6 @@
 //    Elmo's second dialog.
 
 // Size = 5
-// Gender = 1
 000-2-3,27,27,0	script	Elmo	409,{
     set .@q, getq(ShipQuests_ArpanMoney);
     if (.@q == 1) goto L_GotMoney;
@@ -63,4 +62,8 @@ L_GotMoney:
     mesq l("Other than that, I don't know much about what else is going on, so directly asking the Cap'tain about it could be a good idea.");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt
index 1d94ffd5..1a1b90a6 100644
--- a/npc/000-2-3/hammock.txt
+++ b/npc/000-2-3/hammock.txt
@@ -4,7 +4,6 @@
 // Description:
 //    Animated hammock at the top level of the ship.
 
-// Gender = 2
 000-2-3,28,24,0	script	#name5	904,1,0,{
 
 OnTouchFirst:
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 968cfa35..5d44c658 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -24,7 +24,6 @@
 //    12   Gave all of the boxes to Gugli.
 
 // Size = 5
-// Gender = 1
 000-2-3,25,26,0	script	Nard	406,{
     set .@nard, getq(ShipQuests_Nard);
     set .@gugli, getq(ShipQuests_Gugli);
@@ -220,4 +219,8 @@ L_Already:
     mesq l("Sorry, I don't need any help right now. Come back later.");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-3/piourocket.txt b/npc/000-2-3/piourocket.txt
index a1e82566..195407ae 100644
--- a/npc/000-2-3/piourocket.txt
+++ b/npc/000-2-3/piourocket.txt
@@ -5,7 +5,6 @@
 //    Jumping piou.
 
 // Size = 3
-// Gender = 2
 000-2-3,27,23,4	script	#piourocket	408,{
     setnpcdir 2;
     stopnpctimer;
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index c7205868..ea7f2ba4 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -6,7 +6,6 @@
 // Description:
 //    End of introduction with Nard and Elmo talking about the player.
 
-// Gender = 0
 000-2-3,21,28,0	script	AreaTop	32767,0,5,{
 
 OnTouch:
@@ -49,5 +48,4 @@ OnTouch:
     mesq l("Sure, cap'tain.");
 
     close;
-
 }