7 files changed, 22 insertions, 21 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8f366d5b3..04b6d0c34 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/06/26
+	* Changed all 'dyestuff' words -> 'Dyestuffs' which's correct [Lupus]
 2007/06/25
 	* Rev. 10810 Rather large Kafra update. (May need further testing) [L0ne_W0lf]
 	- Updated a good portion of the kafra functions.
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 1f1a9ea06..2e12104f9 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -64,7 +64,7 @@ L_ITEM_1c:
 	close;
 L_ITEM_2c:
 	mes "[Zac]";
-	mes "Oh, dear. You need 1 Cobaltblue Dyestuff...";
+	mes "Oh, dear. You need 1 Cobaltblue Dyestuffs...";
 	close;
 L_ITEM_3c:
 	mes "[Zac]";
@@ -77,7 +77,7 @@ L2:
 	menu "Bongun Hat",L2_4;
 L2_4:
 	mes "[Zac]";
-	mes "You need 10 Amulets, 1 Cobaltblue Dyestuff and 1 Munak Hat for Bongun Hat.";
+	mes "You need 10 Amulets, 1 Cobaltblue Dyestuffs and 1 Munak Hat for Bongun Hat.";
 	close;
 L3:
 	mes "[Zac]";
@@ -292,11 +292,11 @@ L_ITEM_1d:
 	close;
 L_ITEM_2d:
 	mes "[Pac]";
-	mes "Oh, dear. You need 1 DarkGreen Dyestuff...";
+	mes "Oh, dear. You need 1 DarkGreen Dyestuffs...";
 	close;
 L_ITEM_3d:
 	mes "[Pac]";
-	mes "Oh, dear. You need 1 Lemon Dyestuff...";
+	mes "Oh, dear. You need 1 Lemon Dyestuffs...";
 	close;
 L_ITEM_4d:
 	mes "[Pac]";
@@ -317,7 +317,7 @@ L2_26:
 	close;
 L2_29:
 	mes "[Pac]";
-	mes "You need 25 Steels, 1 DarkGreen Dyestuff, 1 Lemon Dyestuff, 150 Fabric and 2 Gold Bar's for Sphinx Hat.";
+	mes "You need 25 Steels, 1 DarkGreen Dyestuffs, 1 Lemon Dyestuffs, 150 Fabric and 2 Gold Bar's for Sphinx Hat.";
 	close;
 L3:
 	mes "[Pac]";
diff --git a/npc/custom/quests/fashion.txt b/npc/custom/quests/fashion.txt
index 72e9b3469..bbeb56b6b 100644
--- a/npc/custom/quests/fashion.txt
+++ b/npc/custom/quests/fashion.txt
@@ -44,7 +44,7 @@ M_INFO:
 	mes "[Fashionable Glasses Quest]";
 	mes "Ok all you have to do is collect"; 
 	mes "^CC66331 Jack'a Dandy^000000"; 
-	mes "and ^CC66331 Scalet Dyestuff^000000.";
+	mes "and ^CC66331 Scalet Dyestuffs^000000.";
 	next;
 	menu "Accept",-,"Leave",M_LEAVE;
 	
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index 88e138762..2d6578ac8 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -142,8 +142,8 @@ M_5:
  next;
  mes "[Yakima]";
  mes "Well... we construct it from some common items:";
- mes "1 Scarlet Dyestuff,";
- mes "1 Orange Dyestuff,";
+ mes "1 Scarlet Dyestuffs,";
+ mes "1 Orange Dyestuffs,";
  mes "2 Stop Posts,";
  mes "3 Clown Noses,";
  mes "180 Fig Leaves and";
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 6fa1c4fdf..8bb9af19f 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -360,7 +360,7 @@ sL_Zeny:
 	close;
 
 sL_NoDye:
-	mes "For me to dye your clothes, I'll need the appropriate Dyestuff. Please check my price list for the information.";
+	mes "For me to dye your clothes, I'll need the appropriate Dyestuffs. Please check my price list for the information.";
 	next;
 
 L_Busy:
@@ -371,14 +371,14 @@ L_PriceList:
 	mes "[Dyer Ginedin Rephere]";
 	mes "Here is the list of colors you can choose from and their prices:";
 	mes " ";
-	mes " - ^FF4422Red^000000: 10000 zeny, 1 Scarlet Dyestuff";
-	mes " - ^D5A500Yellow^000000: 10000 zeny, 1 Lemon Dyestuff";
-	mes " - ^AA00AAViolet^000000: 10000 zeny, 1 Violet Dyestuff";
-	mes " - ^FF8800Orange^000000: 10000 zeny, 1 Orange Dyestuff";
-	mes " - ^4422FFBlue^000000: 10000 zeny, 1 CobaltBlue Dyestuff";
-	mes " - ^009500Green^000000: 10000 zeny, 1 DarkGreen Dyestuff";
-	mes " - Black: 10000 zeny, 1 Black Dyestuff";
-	mes " - White: 10000 zeny, 1 White Dyestuff";
+	mes " - ^FF4422Red^000000: 10000 zeny, 1 Scarlet Dyestuffs";
+	mes " - ^D5A500Yellow^000000: 10000 zeny, 1 Lemon Dyestuffs";
+	mes " - ^AA00AAViolet^000000: 10000 zeny, 1 Violet Dyestuffs";
+	mes " - ^FF8800Orange^000000: 10000 zeny, 1 Orange Dyestuffs";
+	mes " - ^4422FFBlue^000000: 10000 zeny, 1 CobaltBlue Dyestuffs";
+	mes " - ^009500Green^000000: 10000 zeny, 1 DarkGreen Dyestuffs";
+	mes " - Black: 10000 zeny, 1 Black Dyestuffs";
+	mes " - White: 10000 zeny, 1 White Dyestuffs";
 	goto M_Menu;
 
 L_End:
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 9e99bdc3d..71c069960 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -15,8 +15,7 @@
 //============================================================ 
 
 morocc_in,146,99,3	script	Java Dullihan	58,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_Weight < 200) {
+	if (MaxWeight-Weight < 200) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 82cb21986..eefeed271 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -123,14 +123,14 @@ prt_in,243,168,4	script	Jovovich	91,{
 			mes "When you're feeling down , when you get dumped, when you want to impress someone, or even when you just want to stand out...";
 			next;
 			mes "[Hairdresser Jovovich]";
-			mes "For that special place and time, wouldn't you want a hairstyle of your very own? As long as you have the appropriate dyestuff, I will make your hair look wonderful.";
+			mes "For that special place and time, wouldn't you want a hairstyle of your very own? As long as you have the appropriate dyestuffs, I will make your hair look wonderful.";
 			next;
 			mes "[Hairdresser Jovovich]";
 			mes "And try not to worry too much about the fee. Acquiring beauty is the same as acquiring everything. Hehe~";
 			next;
 			mes "[Hairdresser Jovovich]";
 			mes "* Fees and Information *";
-			mes "- 1 Dyestuff item of the color of hair you want.";
+			mes "- 1 Dyestuffs item of the color of hair you want.";
 			mes "- 1000 zeny fee.";
 			break;