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

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -185,22 +185,6 @@
 	emote_type = EMOTE_AUDIBLE
 	restraint_check = TRUE
 
-
-
-/datum/emote/living/dab/run_emote(mob/living/user, params)
-	if (ishuman(user))
-		var/def_zone = BODY_ZONE_CHEST
-		var/luck = (rand(1,100))
-		if(luck >= 65)
-			user.adjustStaminaLoss(70)
-		if(luck >= 80)
-			def_zone = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
-			user.apply_damage(20, BRUTE, def_zone)
-		if(luck >= 95)
-			user.adjustBrainLoss(100)
-	. = ..()
-
-
 /datum/emote/living/mothsqueak
 	key = "msqueak"
 	key_third_person = "lets out a tiny squeak"

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)