1 files changed, 3 insertions, 35 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 340976c3..91bbec65 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -7,7 +7,7 @@
 OnInit:
     if (debug >= 2) end;
     donpcevent strnpcinfo(0) + "::OnTimer20000";
-    goto L_Clock;
+    end;
 
 OnTimer20000:
     donpcevent "#XmasConfig::OnCommandRestartQuest";
@@ -66,17 +66,6 @@ OnClock2313:
     goto L_Clock;
 
 L_Clock:
-    // Christmas 2022 code, remove it later
-    areamonster "034-1", 20, 20, 160, 110, "", 1162, 64;
-    areamonster "033-1", 20, 20, 120, 110, "", 1162, 64;
-    areamonster "046-1", 20, 20, 160, 115, "", 1162, 64;
-    areamonster "047-1", 20, 20, 200, 180, "", 1162, 240;
-    areamonster "033-1", 20, 20, 120, 110, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco331";
-    areamonster "034-1", 20, 20, 160, 110, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco341";
-    areamonster "046-1", 20, 20, 160, 115, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco461";
-    areamonster "047-1", 20, 20, 200, 180, "", SnowmanBoss, 2, "#HolidayConfig::OnCuoco471";
-    announce "Santa : Ho ho ho, I see a huge movement by the grinchboos!", 0;
-
     // Official code below:
     if (gettime(4) == 5)
         goto L_Friday;
@@ -116,37 +105,16 @@ OnLameShield:
     // TODO: Once MLP brings the Dragon Shield, replace with HMC Hat.
     if (rand(10000) > 9)
         goto L_Die;
-    getitem "DragonShield", 1;
+    getitem DragonShield, 1;
     end;
 
 OnLameHat:
     // Chance: 0.1%
     if (rand(1000) > 1)
         goto OnLameShield;
-    getitem "HMCPirateHat", 1;
-    end;
-
-OnCuoco:
-    // TODO: Detect alts?
-    getitem Naftalin, 15;
+    getitem HMCPirateHat, 1;
     end;
 
-OnCuoco331:
-    areatimer 0, "033-1", 20, 20, 120, 110, 10, "#HolidayConfig::OnCuoco";
-    goto OnCuoco;
-
-OnCuoco341:
-    areatimer 0, "034-1", 20, 20, 160, 110, 10, "#HolidayConfig::OnCuoco";
-    goto OnCuoco;
-
-OnCuoco461:
-    areatimer 0, "046-1", 20, 20, 160, 115, 10, "#HolidayConfig::OnCuoco";
-    goto OnCuoco;
-
-OnCuoco471:
-    areatimer 0, "047-1", 20, 20, 200, 180, 10, "#HolidayConfig::OnCuoco";
-    goto OnCuoco;
-
 L_Die:
     end;
 }