summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2019-03-04 13:13:42 +0000
committerMicksha <ms-shaman@gmx.de>2019-03-04 13:13:42 +0000
commit019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3 (patch)
treee4b6b8a0543eccf3ad46701c4d30e66170bc1d1f
parent7d56f5faddfa75d5a35d3bcb0e27d5069e26d073 (diff)
parent2620bb108730501029a1b24313ca437a222a56f5 (diff)
downloadserverdata-019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3.tar.gz
serverdata-019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3.tar.bz2
serverdata-019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3.tar.xz
serverdata-019ebd01ca5f0aaa7fe890657d40a4d6b3ebd9f3.zip
Merge branch 'jesusalva/miscimprovements' into 'master'
These minor improvements are important for the game. See merge request evol/serverdata!158
-rw-r--r--conf/atcommand.conf1
-rw-r--r--npc/000-0-0/sailors.txt1
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;