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/re/guides/guides_juno.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/re/guides/guides_juno.txt')
| -rw-r--r-- | npc/re/guides/guides_juno.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt index 924de82a1..dc85f0743 100644 --- a/npc/re/guides/guides_juno.txt +++ b/npc/re/guides/guides_juno.txt @@ -13,7 +13,7 @@ //= 1.2 Navigation system update. [Euphy] //============================================================ -yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ +yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 8_F_GIRL,{ mes "[Juno Guide]"; mes "A place that takes the vision of the future, and gives it form in the present. Welcome to"; mes "the city of ^8B4513Juno^000000!"; @@ -160,4 +160,4 @@ L_Mark: mes "Would you like to check any other locations?"; return; } -yuno,153,47,4 duplicate(GuideJuno) Juno Guide#yuno02 700 +yuno,153,47,4 duplicate(GuideJuno) Juno Guide#yuno02 8_F_GIRL |