Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/modules/mob/living/carbon/human/species.dm

@@ -80,21 +80,23 @@
 		else
 			target.Move(target_shove_turf, shove_dir)
 			if(get_turf(target) == target_oldturf)
-				var/thoushallnotpass = FALSE
-				for(var/obj/O in target_shove_turf)
-					if(O.density)
-						shove_blocked = TRUE
+				if(target_shove_turf.density)
+					shove_blocked = TRUE
+				else
+					var/thoushallnotpass = FALSE
+					for(var/obj/O in target_shove_turf)
 						if(istype(O, /obj/structure/table))
 							target_table = O
-						else
+						else if(!O.CanPass(src, target_shove_turf))
+							shove_blocked = TRUE
 							thoushallnotpass = TRUE
-				if(thoushallnotpass)
-					target_table = null
+					if(thoushallnotpass)
+						target_table = null
 
 		if(target.is_shove_knockdown_blocked())
 			return
 
-		if(shove_blocked)
+		if(shove_blocked || target_table)
 			var/directional_blocked = FALSE
 			if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
 				var/target_turf = get_turf(target)