diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/quests/quests_lutie.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/quests/quests_lutie.txt')
| -rw-r--r-- | npc/quests/quests_lutie.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 5d0c7b099..8036e9471 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -16,7 +16,7 @@ //= 1.4 Updated NPCs once again. [L0ne_W0lf] //============================================================ -xmas,117,295,4 script Vending Machine Man 704,{ +xmas,117,295,4 script Vending Machine Man 4_M_BIBI,{ mes "[Titicupe]"; mes "Hmm...?"; mes "I, Titicupe, esteemed manager of the Toy Factory and genius inventor, has done it again! I've just created the world's most sophisticated vending machine!"; @@ -138,7 +138,7 @@ xmas,117,295,4 script Vending Machine Man 704,{ } } -xmas,115,297,4 script Vending Machine 111,{ +xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ mes "[Audi]"; mes "^555555Exciting item vending machine. Invented by great Titicupe. Select the desired item and place required items into snowmouth receptacle.^000000"; next; |