From 1df100db5adb57057b93fc29cb973cfdd8f29302 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Tue, 3 Jan 2017 18:19:43 -0800 Subject: [PATCH] fixes people getting thrown into themselves --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8e07c984429..18318df5fd0 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -96,7 +96,7 @@ if(hit_atom.density && isturf(hit_atom)) Weaken(1) take_bodypart_damage(10) - if(iscarbon(hit_atom)) + if(iscarbon(hit_atom) && hit_atom != src) var/mob/living/carbon/victim = hit_atom if(victim.movement_type & FLYING) return