3 files changed, 2 insertions, 8 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 6d61f446..29406f63 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -6,17 +6,13 @@
 
 OnInit:
     if (debug >= 2) end;
-    goto L_StartTimer;
-
-L_StartTimer:
-    setnpctimer 0;
-    initnpctimer;
+    donpcevent strnpcinfo(0) + "::OnTimer20000";
     end;
 
 OnTimer20000:
-    setnpctimer 0;
     donpcevent "#XmasConfig::OnCommandRestartQuest";
     donpcevent "#HalloweenConfig::OnCommandRestartQuest";
+    donpcevent "Easter Eggs::OnCheckEaster";
     initnpctimer;
     end;
 }
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index cbc918e2..8f3d066e 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -42,7 +42,6 @@ L_LastReset:
     goto L_Debug;
 
 L_HalloweenTimeKey:
-    if (getgmlevel() < 20) goto L_Close;
     mes "Halloween Time Key Change.";
     mes "Start Month?";
     input @halloween_time_key_smonth;
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index f0170a0d..6c513ff1 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -96,7 +96,6 @@ L_Reset:
     goto L_Close;
 
 L_XmasTimeKey:
-    if (getgmlevel() < 20) goto L_Close;
     mes "Xmas Time Key Change.";
     mes "Start Month?";
     input @xmas_time_key_smonth;