From cfb7749903ee9725019badc32b129a53ef839e74 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Nov 2017 17:53:50 -0500
Subject: [PATCH 1/2] Merge pull request #33109 from ShizCalev/camera-teleport

Cancels camera view on teleport
---
 code/datums/helper_datums/teleport.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 5d04d1c7c0..c030bd4c2a 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -119,6 +119,9 @@
 			playSpecials(destturf,effectout,soundout)
 			if(ismegafauna(teleatom))
 				message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_COORDJMP(curturf)] to [ADMIN_COORDJMP(destturf)].")
+	if(ismob(teleatom))
+		var/mob/M = teleatom
+		M.cancel_camera()
 	return 1
 
 /datum/teleport/proc/teleport()