summaryrefslogtreecommitdiff
path: root/npc/020-2_Nivalis
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-02-18 19:57:35 +0000
committerJared Adams <jaxad0127@gmail.com>2009-02-18 19:57:35 +0000
commit7464175373616085130e0d2e3b9ddc8e0322f291 (patch)
tree039d01f52f6b76af2d1c7526b1673d646ddf532c /npc/020-2_Nivalis
parent60e20acf62941b81bd560c87a2cf161e16ea2277 (diff)
parent291215cde58a739d13a5bfd519489b736d8302dc (diff)
downloadserverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.gz
serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.bz2
serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.xz
serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.zip
Merge commit 'mainline/master'
Conflicts: npc/001-1_Tulimshar/elanore.txt npc/013-3_Cave/barrier.txt npc/015-3/katze.txt
Diffstat (limited to 'npc/020-2_Nivalis')
-rw-r--r--npc/020-2_Nivalis/furquest.txt1
-rw-r--r--npc/020-2_Nivalis/shops.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index f5db8348..2d988f75 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -333,4 +333,5 @@ L_State_13:
L_TooMany:
mes "[Agostine, The Legendary Tailor]";
mes "\"You don't have anywhere to put them. Come back when you do.";
+ close;
}
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt
index f3d9dedc..fa7d8fe6 100644
--- a/npc/020-2_Nivalis/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
@@ -18,4 +18,5 @@
mes "That's impossible!\"";
next;
callfunc "Inn";
+ close;
}