From 6a2f7ec3cfb2cbcc15e70b0a4c04b6b3f68560f6 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Thu, 2 Jul 2020 01:15:35 -0400
Subject: [PATCH] Fixes jaunting mobs being unable to move through bar tables
 (#51947)

---
 code/modules/shuttle/special.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index 11c438b622d..dde691ef83c 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -190,15 +190,15 @@
 	var/boot_dir = 1
 
 /obj/structure/table/wood/bar/Crossed(atom/movable/AM)
-	if(isliving(AM) && !is_barstaff(AM))
+	var/mob/living/M = AM
+	if(istype(M) && !M.incorporeal_move && !is_barstaff(M))
 		// No climbing on the bar please
-		var/mob/living/M = AM
 		var/throwtarget = get_edge_target_turf(src, boot_dir)
 		M.Paralyze(40)
 		M.throw_at(throwtarget, 5, 1)
 		to_chat(M, "<span class='notice'>No climbing on the bar please.</span>")
 	else
-		. = ..()
+		return ..()
 
 /obj/structure/table/wood/bar/proc/is_barstaff(mob/living/user)
 	. = FALSE