diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-03-05 11:07:29 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-03-05 11:07:29 -0300 |
| commit | d8ff357ac63f8b880c38a94be1a8d9b1e03ab0cd (patch) | |
| tree | d4e679256ecb99e8d5ce7bd7998b5ea57dff6ec5 | |
| parent | 1735d33de31e74f2d275aea728d297eb39e8b242 (diff) | |
| parent | 019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3 (diff) | |
| download | serverdata-d8ff357ac63f8b880c38a94be1a8d9b1e03ab0cd.tar.gz serverdata-d8ff357ac63f8b880c38a94be1a8d9b1e03ab0cd.tar.bz2 serverdata-d8ff357ac63f8b880c38a94be1a8d9b1e03ab0cd.tar.xz serverdata-d8ff357ac63f8b880c38a94be1a8d9b1e03ab0cd.zip | |
Merge branch 'master' into jesusalva/sandwhich
| -rw-r--r-- | conf/atcommand.conf | 1 | ||||
| -rw-r--r-- | npc/000-0-0/sailors.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/conf/atcommand.conf b/conf/atcommand.conf index 91485f3b..57356202 100644 --- a/conf/atcommand.conf +++ b/conf/atcommand.conf @@ -23,6 +23,7 @@ aliases: { mobinfo: ["monsterinfo", "mi"] iteminfo: ["ii"] time: ["date", "serverdate", "servertime"] + tonpc: ["npc"] autotrade: ["at"] help: ["h"] jumpto: ["goto", "warpto"] diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index 5aa56deb..87ed2b34 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -69,6 +69,7 @@ OnTalk: addtimer(45000,"Magic Arpan::OnSlow"); warp "000-2-1", 50, 38; savepoint "000-2-1", 50, 38; + percentheal 100, 100; closeclientdialog; close; |