diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /npc/024-14/doorbell.txt | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'npc/024-14/doorbell.txt')
| -rw-r--r-- | npc/024-14/doorbell.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/024-14/doorbell.txt b/npc/024-14/doorbell.txt index ef0a04246..166a1b387 100644 --- a/npc/024-14/doorbell.txt +++ b/npc/024-14/doorbell.txt @@ -62,7 +62,7 @@ L_Manage: goto L_Furniture; break; case 3: - addtimer2(150, "NPCs#RES_PPL::OnReload"); + addtimer2(150, instance_npcname("NPCs#RES_PPL")+"::OnReload"); close; break; } |