From 4b2db8fae2e0bc88c2b2e4d601ff48575f102192 Mon Sep 17 00:00:00 2001 From: nichlas0010 Date: Mon, 26 Nov 2018 15:24:59 +0100 Subject: [PATCH] do_teleport now also checks the destination --- code/datums/helper_datums/teleport.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 3ba79eb9451..632dc6aeacb 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -51,7 +51,8 @@ return FALSE var/area/A = get_area(curturf) - if(A.noteleport) + var/area/B = get_area(destturf) + if(A.noteleport || B.noteleport) return FALSE tele_play_specials(teleatom, curturf, effectin, asoundin)