summaryrefslogtreecommitdiff
path: root/world/map/npc/easter
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/easter
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/easter')
-rw-r--r--world/map/npc/easter/2010/eggs.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/npc/easter/2010/eggs.txt b/world/map/npc/easter/2010/eggs.txt
index 0b1af508..cf4b81f4 100644
--- a/world/map/npc/easter/2010/eggs.txt
+++ b/world/map/npc/easter/2010/eggs.txt
@@ -85,6 +85,7 @@ L_Needle:
end;
OnInit:
+ if (debug >= 2) end;
initnpctimer;
OnTimer300000: