4 files changed, 91 insertions, 2 deletions
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index e4ed6b1b..a06099a1 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -168,7 +168,7 @@ OnTimer1000:
     set $@AEASTER_mapcount, 1 + getmapusers("008-1.gat") / 3;
 
     set $@isEaster, 0;
-    if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25) || debug)
+    if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25))
         set $@isEaster, 1;
 
     if (!$@wasEaster && $@isEaster)
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 544eeaf9..47a7783f 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -96,7 +96,7 @@ L_Mine: // player asked how to get Ice Cubes
     mes "[Eomie]";
     mes "\"Hm, that's a difficult task, indeed. Naturally you will find them on the continent of Kaizei, which is high up in the north and covered with snow most time of the year. But it might be difficult to get there.\"";
     next;
-    mes "\"But I heard that Ice Goblins were seen in this underground palace that was discovered in the desert south of the city. Maybe you can find Ice Cubes in there.\"";
+    mes "\"I heard that Ice Goblins were seen in the caves that are East of Nivalis. Maybe you can find Ice Cubes in there.\"";
     next;
     mes "\"Though they don't let in everyone. Miners, Soldiers and sometimes an adventurer. I suggest you talk to Lieutenant Dausen about that.\"";
     goto L_Close;
diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index ae18387c..38d5f638 100644
--- a/world/map/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
@@ -3,4 +3,5 @@
 map: 026-1.gat
 npc: npc/026-1/_mobs.txt
 npc: npc/026-1/_warps.txt
+npc: npc/026-1/munro.txt
 npc: npc/026-1/sign.txt
diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt
new file mode 100644
index 00000000..1151e3b8
--- /dev/null
+++ b/world/map/npc/026-1/munro.txt
@@ -0,0 +1,88 @@
+026-1.gat,24,37,0|script|Munro|183,
+{
+    mes "[Munro]";
+    mes "\"Whoh dude...\"";
+    next;
+    mes "[Munro]";
+    mes "\"Man.. I don't know how I got here.. freaky..\"";
+    next;
+    mes "[Munro]";
+    mes "\"Hey dude, what's that on your face? It's creeping me out!\"";
+    menu
+        "There is nothing on my face..", L_Nothing,
+        "What, This skin?",-;
+    mes "[Munro]";
+    mes "\"Skin? Whoh far-out man.. This must be that weirdo place my brother Parua told me about..\"";
+    next;
+    mes "Munro stares at you vacantly for a moment";
+    next;
+    mes "Munro's eye-holes suddenly seem more aware";
+    next;
+    mes "[Munro]";
+    mes "\"WHOH! SKIN? d.....dude! How can you stand having that stuff all over you? That's gotta suck!\"";
+    next;
+    mes "[Munro]";
+    mes "\"Here dude.. Take this. It won't get rid of that groady skin but it'll at least make you LOOK normal..\"";
+    getitem "SkeletonCharm",1;
+    next;
+    mes "[Munro]";
+    mes "\"I have a lot of these man.. a LOT. Take all you want man.. Just remember they only work when I'm around to power them. Freaky-deaky skull power you know?\"";
+    close;
+    goto L_Exit;
+
+L_Nothing:
+    mes "[Munro]";
+    mes "\"Oh.. ok dude! Whatever you say!\"";
+    goto L_Exit;
+
+L_Exit:
+    close;
+}
+
+026-1.gat,25,37,0|script|#AnnualHalloween|-1,
+{
+    end;
+
+OnInit:
+    initnpctimer;
+    end;
+
+OnTimer1000:
+    set $@isHalloween, 0;
+    if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5) || debug)
+        set $@isHalloween, 1;
+
+    if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26) || debug)
+        set $@isHalloween, 1;
+
+    if ($@isHalloween)
+        goto L_enablemunro;
+
+    goto L_disablemunro;
+
+
+L_enablemunro:
+    enablenpc "Munro";
+    goto L_End;
+
+L_disablemunro:
+    disablenpc "Munro";
+
+L_End:
+    end;
+}
+
+
+function|script|CheckMunro|,
+{
+    if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5))
+        goto L_Return;
+
+    if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26))
+        goto L_Return;
+
+    // unequipbyid @slotId;
+
+L_Return:
+    return;
+}