2 files changed, 14 insertions, 25 deletions
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index a262fe5cb..cc7cccbe9 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Persian, Vicious_Pucca, Completed by aoa00
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.1 Changed the mobster spawn to g_mobster to prevent exploits [MasterOfMuppets]
 //= 1.2 Added the cube room quest by DeNy, translated by vicious_pucca. [MasterOfMuppets]
 //=	Thanks to Linuxwolf for a grammar check as well =).
+//= 1.2a Moved Biolab entrance to lhz_dun warps. [Vicious]
 //============================================================ 
 //= aoa's comment
 //= In future, Need for new monsters. No-Drop, No-Exp, Weak "Mobster","VENOMOUS","NOXIOUS"
@@ -1204,24 +1205,6 @@ L4_1:
 	end;
 }
 
-//--------------------------Sewer Pipe--------------------------
-
-lighthalzen.gat,313,301,0	script	Sewer Pipe	111,{
-	mes "You see some pipes for a sewage system.";
-	if(countitem(2657) == 0 && hzdun == 1)goto s_Find;
-	if(countitem(2657) != 0)goto s_Find;
-	close;
-s_Find:
-	mes "You found the way into the lab.";
-	next;
-	menu "Go in.",L_1,"Do not go in.",-;
-	close;
-
-L_1:
-	warp "lhz_cube.gat",231,17;
-	end;
-}
-
 //--------------------------Warps--------------------------
 
 //Cube room <-> Lighthalzen
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt
index d34569a11..9df5a6f27 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhalzen_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
-//= 1.6a
+//= 1.6b
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c
 //= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
 //= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
+//= 1.6b Updated Sewer Pipe [Vicious]
 //============================================================
 
 lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,147
@@ -35,15 +36,20 @@ lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lighthalzen.gat,73,54
 //lighthalzen.gat,73,52,0	warp	lhz007a	1,1,lhz_dun01.gat,150,288
 //This should be only an Exit. This warp doesn't exist on kRO.
 
-//--------------------------Sewage Tube--------------------------
+//--------------------------Sewer Pipe--------------------------
 
-lighthalzen.gat,313,301,0	script	Sewage Tube	111,{
-	mes "The sewage tube which leads to laboratory underground.";
+lighthalzen.gat,313,301,0	script	Sewer Pipe	111,{
+	mes "You see some pipes for a sewage system.";
+	if(countitem(2657) == 0 && hzdun == 1)goto s_Find;
+	if(countitem(2657) != 0)goto s_Find;
+	close;
+s_Find:
+	mes "You found the way into the lab.";
 	next;
-	menu "Enter",M_1,"Do not enter",-;
+	menu "Go in.",L_1,"Do not go in.",-;
 	close;
 
-M_1:
+L_1:
 	warp "lhz_cube.gat",231,17;
 	end;
 }