summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/items/teleporter.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
index f88540ad2..90deb80c1 100644
--- a/npc/items/teleporter.txt
+++ b/npc/items/teleporter.txt
@@ -48,7 +48,7 @@ L_Save:
} else {
doevent "shake::OnGM";
warp "Save", 0, 0;
- TELEPORTER_TIME=gettimetick(2)+(60*30)-(.@x*60);
+ TELEPORTER_TIME=gettimetick(2)+min((60*30)-(.@x*60), 30);
}
closedialog;
end;
@@ -59,7 +59,7 @@ L_LoF:
} else {
doevent "shake::OnGM";
warp "017-1", 120, 89;
- TELEPORTER_TIME=gettimetick(2)+(60*50)-(.@x*60);
+ TELEPORTER_TIME=gettimetick(2)+min((60*50)-(.@x*60), 30);
}
closedialog;
end;