Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/item_db.txt

3 files changed, 8 insertions, 8 deletions

diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 6343e517..0a295d65 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,4 +1,4 @@
-010-2.gat,33,25,0|script|Chef|148,
+010-2.gat,33,25,0|script|Chef#dimond|148,
 {
 // lines belong to Easter 2011:
 // set @month, 4;
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 8fe8cbc5..300891c3 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -216,7 +216,7 @@
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_Full_Inv;
-    getitem "bowlerhat", 1;
+    getitem "BowlerHat", 1;
     set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
     close;
 
@@ -501,14 +501,14 @@ leave:
     close;
 }
 
-010-2.gat,71,38,0|script|Store Policy|400,
+010-2.gat,71,38,0|script|Store Policy#1|400,
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,77,38,0|script|Store Policy|400,
+010-2.gat,77,38,0|script|Store Policy#2|400,
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
@@ -565,7 +565,7 @@ leave:
 
 010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow :-1,IronArrow :-1,LeatherShield :-1
 
-010-2.gat,65,41,0|shop|General Store|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
+010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
 
 010-2.gat,75,68,0|script|Basil|107,
 {
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 436f7f09..906bd874 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -751,7 +751,7 @@ L_robe_sheets:
     mes "[Lora Tay the Seamstress]";
     mes "The seamstress puts your GP away, takes your measurements and puts the silk sheets on the table.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
     next;
-    
+
 L_get_robe:
     mes "[Lora Tay the Seamstress]";
     mes "She proceeds to make a number of mysterious marks on the sheets with a charcoal pen.  Meanwhile, your arms are getting tired, but you're afraid to lower them-- she used a lot of pins to put everything into place, and you lost track of where they went...";
@@ -763,7 +763,7 @@ L_get_robe:
     mes "[Lora Tay the Seamstress]";
     mes "She then treats the seams with some odorless liquid, making them vanish completely.  Finally she hands you the finished robe.";
     getitem "SilkRobe", 1;
-    if (@Robe_with_sheets == 1) 
+    if (@Robe_with_sheets == 1)
         goto L_robe_sheet_end;
     mes "\"Here you are now, this will fit.  And don't you dare tell anyone that I did this!  I'm not about to start a silk cocoon collection!\"";
     next;
@@ -823,7 +823,7 @@ L_robe_nosilk:
     goto L_main_menu;
 
 L_end:
-    set @ROBE_COCOONS_NR, 0; 
+    set @ROBE_COCOONS_NR, 0;
     set @ROBE_ZENY, 0;
     set @ROBE_SHEETS_NR, 0;
     set @ROBE_SHEETS_ZENY, 0;