Merge pull request #1784 from Citadel-Station-13/upstream-merge-28770

[MIRROR] Fixes piggybacking giving person on top projectile density instead of the person on the bottom.
2017-06-26 10:09:34 -05:00
parent 90c1542e4b 06e536de4f
commit 89fc77521e
1 changed files with 2 additions and 0 deletions
@@ -87,6 +87,8 @@
 			new impact_effect_type(target_loca, target, src)
 		return 0
 	var/mob/living/L = target
+	if(L.buckled && ismob(L.buckled))
+		L = L.buckled
 	if(blocked != 100) // not completely blocked
 		if(damage && L.blood_volume && damage_type == BRUTE)
 			var/splatter_dir = dir