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

Conflicts:
	world/map/db/mob_db.txt

4 files changed, 10 insertions, 5 deletions

diff --git a/world/map/npc/056-2/_mobs.txt b/world/map/npc/056-2/_mobs.txt
index 75c4d9f3..c893945e 100644
--- a/world/map/npc/056-2/_mobs.txt
+++ b/world/map/npc/056-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-056-2.gat,0,0,0|script|Mob056-2|-1,{
+056-2.gat,0,0,0|script|Mob056-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/056-2/barrier.txt b/world/map/npc/056-2/barrier.txt
index dc26dbfb..a9f12a5d 100644
--- a/world/map/npc/056-2/barrier.txt
+++ b/world/map/npc/056-2/barrier.txt
@@ -1,4 +1,5 @@
-056-2.gat,23,33,0|script|#Barrier|45,0,0,{
+056-2.gat,23,33,0|script|#Barrier|45,0,0,
+{
     if (Mirak_Bantime > gettimetick(2))
         goto L_Block;
     if (BaseLevel < 25)
diff --git a/world/map/npc/056-2/mirak.txt b/world/map/npc/056-2/mirak.txt
index d4b8195a..65b46e39 100644
--- a/world/map/npc/056-2/mirak.txt
+++ b/world/map/npc/056-2/mirak.txt
@@ -1,4 +1,5 @@
-056-2.gat,67,24,0|script|Mirak|372,{
+056-2.gat,67,24,0|script|Mirak|372,
+{
 // Variables to set:
 // @dq_cost - The number of points this quest uses
 // @dq_money - The money reward for doing the quest
diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt
index acc9ef87..fb29cd68 100644
--- a/world/map/npc/056-2/notes.txt
+++ b/world/map/npc/056-2/notes.txt
@@ -1,11 +1,13 @@
-056-2.gat,77,34,0|script|Warning|400,{
+056-2.gat,77,34,0|script|Warning|400,
+{
     mes "Turn around. Do not come any closer!";
     mes "Go back upstairs and leave! I don't want to see anybody!";
     mes "This is the last warning!";
     mes "- Mirak";
     close;
 }
-056-2.gat,29,30,0|script|Note|400,{
+056-2.gat,29,30,0|script|Note|400,
+{
     mes "DO NOT GO ANY FURTHER!";
     mes "Put the supplies on the table and do not come downstairs. I don't want to be bothered.";
     mes "- Mirak";