1 files changed, 5 insertions, 1 deletions
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index db73f93e5..729c639ba 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -113,6 +113,10 @@ OnMinute00:
 OnMinute15:
 OnMinute30:
 OnMinute45:
+    // There is no weather in test servers
+    if (debug && !$@GM_OVERRIDE)
+        end;
+
     //debugmes "[Weather.sys] Starting to regen";
 
     .@hti = htiterator(.wcore);
@@ -200,7 +204,7 @@ OnMinute45:
     //debugmes "[Weather.sys] Regenerated";
 
     // Hardcore: Skip day/night cycles
-    if ($HARDCORE || debug) {
+    if ($HARDCORE || $@GM_OVERRIDE) {
         $@WEATHER_NIGHT=is_night(true);
         end;
     }