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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 10 insertions, 6 deletions

diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index bea20d9e..5239c498 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -1,8 +1,8 @@
 // The bakery
 
 // The chef
-021-2.gat,95,21,0|script|Riskim|148,{
-
+021-2.gat,95,21,0|script|Riskim|148,
+{
 // lines belong to easter 2011:
 //    set @month, 4;
 //    set @start_day, 15;
@@ -201,7 +201,8 @@ L_SeeBunny:
 }
 
 // Server?
-021-2.gat,82,23,0|script|Sara|108,{
+021-2.gat,82,23,0|script|Sara|108,
+{
     mes "[Sara]";
     mes "";
     mes "\"Hello!\"";
@@ -212,7 +213,8 @@ L_SeeBunny:
 021-2.gat,89,21,0|shop|Drabur|112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1
 
 // Stockroom boy
-021-2.gat,133,21,0|script|Iormo|160,{
+021-2.gat,133,21,0|script|Iormo|160,
+{
     mes "[Iormo]";
     mes "";
     mes "\"This stock room can get messy.\"";
@@ -220,14 +222,16 @@ L_SeeBunny:
 }
 
 // An old couple eating at the bakery
-021-2.gat,71,22,0|script|Rynoh|159,{
+021-2.gat,71,22,0|script|Rynoh|159,
+{
     mes "[Rynoh]";
     mes "";
     mes "\"The cakes may be expensive, but they sure are delicious!\"";
     close;
 }
 
-021-2.gat,73,22,0|script|Ontas|154,{
+021-2.gat,73,22,0|script|Ontas|154,
+{
     mes "[Ontas]";
     mes "";
     mes "\"We come here every week.  This place has some of the best bread I've ever eaten!\"";