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/merchants/hair_style.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/merchants/hair_style.txt')
| -rw-r--r-- | npc/merchants/hair_style.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index 040802811..47f273930 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -15,7 +15,7 @@ // Hair Dresser Veronica // ============================================================ -alberta_in,55,142,7 script Hair Dresser 91,{ +alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "[Veronica]"; mes "Welcome to Veronica's hair salon."; mes "How can I help you?"; @@ -522,7 +522,7 @@ L_cutin: // Roving Hair Dresser // ============================================================ -alberta,33,141,7 script Roving Hair Dresser 87,{ +alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{ mes "[Rui Vishop]"; mes "That Veronica..."; mes "Hah! Best hair dresser my ass."; @@ -683,7 +683,7 @@ alberta,33,141,7 script Roving Hair Dresser 87,{ // Lighthalzen -lhz_in02,100,143,3 script Hair Dresser#li 122,{ +lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "[Prince Shammi]"; mes "Welcome to Prince Shammi's"; mes "Beauty Shop, the place to go"; @@ -1096,7 +1096,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ } } -lhz_in02,91,155,5 script Assistant Beautician#li 862,{ +lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "[Assistant Beautician]"; mes "Wah?! Sweet Jiminy,"; mes "you freaked me out!"; |