Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-12-21 07:59:33 +08:00
parent fe6556f7b7 d2f3070522
commit fab4b07be5
164 changed files with 128258 additions and 912 deletions
@@ -168,11 +168,13 @@
  * If we hit a valid target (carbon or closed turf), we create the shrapnel_type object and immediately call tryEmbed() on it, targeting what we impacted. That will lead
  *	it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to.
  */
-/datum/element/embed/proc/checkEmbedProjectile(obj/item/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone)
+/datum/element/embed/proc/checkEmbedProjectile(obj/item/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone, blocked)
 	if(!iscarbon(hit))
 		Detach(P)
 		return // we don't care
-
+	if(blocked >= 100)
+		Detach(P)	//fully blocked, no embedding for us.
+		return
 	var/obj/item/payload = new payload_type(get_turf(hit))
 	if(istype(payload, /obj/item/shrapnel/bullet))
 		payload.name = P.name