1 files changed, 9 insertions, 4 deletions
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index a208b371b..c24b31b57 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -167,12 +167,17 @@ OnCall:
     end;
 
 OnPCLoginEvent:
-    if ($MOTD_Disabled < 1) {
+    // Handle events
+    if ($@GM_EVENT)
+        dispbottom l("An event is happening at Aeros! Hurry up!");
+    if ($EVENT$)
+        dispbottom l("It's @@ (day)!", $EVENT$);
+
+    // Handle MOTD
+    if (!$MOTD_Disabled)
         displayMOTD;
-    }
-    if (debug) {
+    if (debug)
         dispbottom "##7<<##B @@help://test-server|" + col(l("Click here for instructions on how to use the test server."),6) + "@@ ##7>>";
-    }
 
     daily_login_bonus_handler();
     end;