Merge pull request #4158 from Citadel-Station-13/upstream-merge-33109

[MIRROR] Cancels camera view on teleport
2017-11-29 03:25:46 +00:00
parent 5fdba02717 db2f89b741
commit 2f42366856
1 changed files with 3 additions and 0 deletions
@@ -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()