diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
| commit | 7464175373616085130e0d2e3b9ddc8e0322f291 (patch) | |
| tree | 039d01f52f6b76af2d1c7526b1673d646ddf532c /npc/015-1_Woodland | |
| parent | 60e20acf62941b81bd560c87a2cf161e16ea2277 (diff) | |
| parent | 291215cde58a739d13a5bfd519489b736d8302dc (diff) | |
| download | serverdata-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/015-1_Woodland')
| -rw-r--r-- | npc/015-1_Woodland/alice.txt | 2 | ||||
| -rw-r--r-- | npc/015-1_Woodland/barrier.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/npc/015-1_Woodland/alice.txt b/npc/015-1_Woodland/alice.txt index 629cfed5..3d789eae 100644 --- a/npc/015-1_Woodland/alice.txt +++ b/npc/015-1_Woodland/alice.txt @@ -65,7 +65,6 @@ L_cave: "What a stupid cat!", -; mes "[Alice]"; mes "\"Please don't do her any harm. See you later!\""; - next; close; L_cat: @@ -76,6 +75,5 @@ L_cat: "Are you crazy? Taming a cat?", -; mes "[Alice]"; mes "\"Well, it's up to you.\""; - next; close; } diff --git a/npc/015-1_Woodland/barrier.txt b/npc/015-1_Woodland/barrier.txt index beeeb976..5cf82848 100644 --- a/npc/015-1_Woodland/barrier.txt +++ b/npc/015-1_Woodland/barrier.txt @@ -3,5 +3,5 @@ 015-1.gat,59,32,0 script #CatOutsideBarrier 127,1,1,{ set KatzeBeenOutside, 1; - close; + // No close here, as this doesn't open any client windows } |