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-3/pot.txt | |
| 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-3/pot.txt')
| -rw-r--r-- | npc/015-3/pot.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/npc/015-3/pot.txt b/npc/015-3/pot.txt index 434954c7..a965223d 100644 --- a/npc/015-3/pot.txt +++ b/npc/015-3/pot.txt @@ -34,7 +34,6 @@ L_GiveMilk: L_HasMilk: mes "There is milk in it."; - next; close; L_NeedsFood: @@ -70,7 +69,6 @@ L_GiveSteak: L_HasFood: mes "There is some food in it."; - next; close; L_NeedsFur: @@ -84,7 +82,6 @@ L_NeedsFur: L_GiveFur: mes "You put down the fur, but the cat doesn't seem to take any notice. Maybe there's something else you could do. You pick the fur up again."; - next; close; L_NeedsWood: @@ -98,12 +95,10 @@ L_GiveWood: set Katze, 4; set KatzeBeenOutside, 0; mes "You put the wooden log next to the pot. The cat eyes it suspiciously, but remains on her spot."; - next; close; L_HasWood: mes "A wooden log is patiently lying next to it."; - next; close; L_Finished: |