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_dyer.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_dyer.txt')
| -rw-r--r-- | npc/merchants/hair_dyer.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index 8b09afa6c..fc1113603 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -15,7 +15,7 @@ //= 1.5 Added Lighthalzen Hair Dying NPC. [L0ne_W0lf] //============================================================ -prt_in,243,168,4 script Jovovich 91,{ +prt_in,243,168,4 script Jovovich 4_F_02,{ mes "[Hairdresser Jovovich]"; mes "Welcome~!"; mes "How may I help you?"; @@ -154,7 +154,7 @@ S_NoDye: } // Lighthalzen -lhz_in02,100,134,3 script Hair Dyer#lich 850,{ +lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ mes "[Rossa]"; if (Sex == 1) { mes "Welcome, come in~"; |