1 files changed, 7 insertions, 3 deletions
diff --git a/npc/functions/shake.txt b/npc/functions/shake.txt
index 0dabfb602..a20fc6b43 100644
--- a/npc/functions/shake.txt
+++ b/npc/functions/shake.txt
@@ -7,16 +7,20 @@
 OnShake:
     @shake+=1;
     movecam rand(-20,20), rand(-20,20);
-    if (@shake < @max_shake)
+
+    if (@shake < @max_shake) {
         addtimer(50, "shake::OnShake");
-    else
+    } else {
         @shake=0;
+        restorecam;
+        closedialog;
+    }
     end;
 
 // Called by GM Command
 OnGM:
     @shake=0;
-    @max_shake=rand(4,8);
+    @max_shake=rand(6,10);
     addtimer(50, "shake::OnShake");
     end;