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/003-0/recepcionist.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/003-0/recepcionist.txt')
-rw-r--r-- | npc/003-0/recepcionist.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/003-0/recepcionist.txt b/npc/003-0/recepcionist.txt index 7bd39ef0f..e2133a2ae 100644 --- a/npc/003-0/recepcionist.txt +++ b/npc/003-0/recepcionist.txt @@ -5,13 +5,13 @@ // Magic School recepcionist (TODO: Give S. Badge) 003-0,47,44,4 script Recepcionist#003-0 NPC_FEMALE,{ - if (getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0; + if (MGQUEST && getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0; mesn; mesq l("Hello, and welcome to the Magic School of Tulimshar."); next; mesn; - mesq l("Unfortunately, we're shutting down. This building is too old."); + mesq l("Thankfully, we'll be moving soon. This building is old and the roof is falling."); next; mesn; mesq l("I hope our new campus get built soon. It'll be much better than here."); |