Merge pull request #25853 from DeityLink/20200216-EffectThrowFix

Fixed mobs getting damaged by massless effects getting thrown around by explosions
vgstation-coders · Feb 16, 2020 · 45c096e · 45c096e
2 parents f6c4dfc + 3a9a87c
commit 45c096e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
@@ -83,7 +83,7 @@
 		return
 	if(flags & INVULNERABLE)
 		return
-	if(istype(AM,/obj/))
+	if(istype(AM,/obj/) && !istype(AM,/obj/effect/effect/))
 		var/obj/O = AM
 		var/zone = ran_zone(LIMB_CHEST,75)//Hits a random part of the body, geared towards the chest
 		var/dtype = BRUTE