From f1c4780376953eae3c5e38b7615c06e07b178431 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 1 Jun 2010 23:01:54 +0000
Subject: * Implemented the Manuk and Splendide item status effects, thanks to
 Epoque. * Implemented Manuk and Splendide consumable items. * Added Splendide
 and Manuk merchants.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14327 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt          | 3 +++
 npc/quests/quests_13_2.txt | 5 +++--
 npc/scripts_athena.conf    | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 97b39190f..5730d5a3d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
 Date		Added
 ======
+2010/06/01
+	* Rev. 14327 Added Splendide and Manuk merchants. [L0ne_W0lf]
+2010/05/30
 	* Rev. 14315 Shop update, and added Wanderer pet food maker NPC. [L0ne_W0lf]
 	- Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta.
 	- Made Brasilis shop names unique, and uncommented.
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 314fb7f5d..dfdbd9984 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7a
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -28,6 +28,7 @@
 //= 1.6 Added the Yggdrasil Dungeon floor 2 puzzle.
 //= 1.7 Added daily quest 'Dragon Egg collection.'
 //= 1.7a Fixed a translation typo. Tabb -> Taab.
+//= 1.8 Added a missing " in the GM only NPC.
 //============================================================ 
 
 // Cat Hand Addition.
@@ -6801,7 +6802,7 @@ mid_camp,7,3,0	script	Translator Preparation#1	708,{
 			next;
 			mes "[EP 13 Translator Quest Preparation]";
 			mes "Current report quest's item is "+ ep13_1_edq +" ";
-			mes "Start Quest?;
+			mes "Start Quest?";
 			next;
 			switch(select("Yes:No")) {
 			case 1:
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 53f656da8..7a408c249 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -56,6 +56,8 @@ npc: npc/merchants/gemstone.txt
 npc: npc/merchants/advanced_refiner.txt
 npc: npc/merchants/elemental_trader.txt
 npc: npc/merchants/enchan_arm.txt
+npc: npc/merchants/manuk.txt
+npc: npc/merchants/splendide.txt
 npc: npc/merchants/wander_pet_food.txt
 // Cash Shop
 // See file before enabling, as you may wish to change the
-- 
cgit v1.2.3-70-g09d2