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/custom/events/xmas_rings_event.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/custom/events/xmas_rings_event.txt')
| -rw-r--r-- | npc/custom/events/xmas_rings_event.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt index 959e3a1a9..8d8be443b 100644 --- a/npc/custom/events/xmas_rings_event.txt +++ b/npc/custom/events/xmas_rings_event.txt @@ -12,7 +12,7 @@ //= 1.2 Fixed double quotes not being escaped [brianluau] //============================================================ -prontera,156,174,4 script Snower 713,{ +prontera,156,174,4 script Snower 4_M_06,{ mes "[Snower]"; if(Q_XMSRINGS==2){ mes "Oh.. is it true? You've helped my sis Sneewy? Thank you."; @@ -97,7 +97,7 @@ OnInit: end; } -louyang,224,249,4 script Sneewy 717,{ +louyang,224,249,4 script Sneewy 4_F_KID3,{ mes "[Sneewy]"; if(Q_XMSRINGS==0){ mes "Hi! I'm waithing for my sister's birdy with mail..."; @@ -140,7 +140,7 @@ M_END: close; } -izlu2dun,133,160,2 script Snoowy 714,{ +izlu2dun,133,160,2 script Snoowy 4_F_06,{ mes "[Snoowy]"; if(Q_XMSRINGS==0){ mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there."; |