Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7

Maybe fixes vehicles blocking projectiles
2020-04-30 17:41:07 +00:00
parent c4250a41d2 0e8c2ca109
commit 7784f5efa1
1 changed files with 2 additions and 0 deletions
@@ -315,6 +315,8 @@
 		objs += O
 	var/obj/O = safepick(objs)
 	if(O)
+		if(length(O.buckled_mobs))
+			return pick(O.buckled_mobs)
 		return O
 	//Nothing else is here that we can hit, hit the turf if we haven't.
 	if(!(T in permutated) && can_hit_target(T, permutated, T == original, TRUE))