summaryrefslogtreecommitdiff
path: root/npc/014-1_Woodland
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/014-1_Woodland
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/014-1_Woodland')
-rw-r--r--npc/014-1_Woodland/wedding-officiator.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 8b25647e..d17fc3b8 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -249,4 +249,5 @@ L_do_divorce:
L_No_Room_For_Rings:
mes "[Wedding Officiator]";
mes "\"You don't have room to carry the rings.\"";
+ close;
}