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

Conflicts:
	world/map/db/mob_db.txt

3 files changed, 12 insertions, 6 deletions

diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt
index 754846e5..35f136e0 100644
--- a/world/map/npc/027-3/_mobs.txt
+++ b/world/map/npc/027-3/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-027-3.gat,0,0,0|script|Mob027-3|-1,{
+027-3.gat,0,0,0|script|Mob027-3|-1,
+{
     end;
 }
diff --git a/world/map/npc/027-3/caskets.txt b/world/map/npc/027-3/caskets.txt
index 3531e2ee..b941195d 100644
--- a/world/map/npc/027-3/caskets.txt
+++ b/world/map/npc/027-3/caskets.txt
@@ -1,5 +1,6 @@
 // Casket monster traps and key puzzle.
-027-3.gat,40,35,0|script|#casket1|400,1,1{
+027-3.gat,40,35,0|script|#casket1|400,1,1
+{
     heal 3,0;
     specialeffect 301;
     specialeffect 302;
diff --git a/world/map/npc/027-3/entrance.txt b/world/map/npc/027-3/entrance.txt
index 490769a1..5449a12c 100644
--- a/world/map/npc/027-3/entrance.txt
+++ b/world/map/npc/027-3/entrance.txt
@@ -1,6 +1,7 @@
 // Effects for opening and closing the gate. Also set it so no new player can't be warped in once the gate is opened.
 
-027-3.gat,40,57,0|script|#gatecontrol|400,2,1{
+027-3.gat,40,57,0|script|#gatecontrol|400,2,1
+{
     mes "Once you pass this point I cannot warp anyone else to help. "
     + "Are you sure you are ready to go?";
     menu
@@ -22,17 +23,20 @@ OnTimer2000:
     end;
 }
 
-027-3.gat,40,59,0|script|#closedgate|322,{
+027-3.gat,40,59,0|script|#closedgate|322,
+{
     end;
 }
 
-027-3.gat,40,59,0|script|#opengate|323,{
+027-3.gat,40,59,0|script|#opengate|323,
+{
     end;
 }
 
 // Effects for the exit.
 
-027-3.gat,40,78,0|script|#cryptexit2|400,3,3{
+027-3.gat,40,78,0|script|#cryptexit2|400,3,3
+{
     mes "Unfortunately, once I bring you to this time pocket"
     + "you cannot leave through its normal exit."
     + "The only way to get out is to defeat the reaper"