From b69c0944c9f1a4f44f79f1e8e3651b366416ce65 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 14 Apr 2020 21:54:23 -0700 Subject: [PATCH] Update human.dm --- .../code/modules/mob/living/carbon/human/human.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human.dm b/modular_citadel/code/modules/mob/living/carbon/human/human.dm index 390cac3646..474c9d2823 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/human.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/human.dm @@ -2,16 +2,15 @@ return /mob/living/carbon/human/resist_embedded() - if(handcuffed || legcuffed || (wear_suit && wear_suit.breakouttime)) + if(handcuffed || (wear_suit && wear_suit.breakouttime)) return - if(CHECK_MOBILITY(src, MOBILITY_MOVE) && !on_fire) + if(CHECK_MOBILITY(src, MOBILITY_USE)) for(var/obj/item/bodypart/L in bodyparts) if(istype(L) && L.embedded_objects.len) for(var/obj/item/I in L.embedded_objects) if(istype(I) && I.w_class >= WEIGHT_CLASS_NORMAL) //minimum weight class to insta-ripout via resist - remove_embedded_unsafe(L, I, src, 1.5) //forcefully call the remove embedded unsafe proc but with extra pain multiplier. if you want to remove it less painfully, examine and remove it carefully. + remove_embedded_unsafe(L, I, src, 1) //forcefully call the remove embedded unsafe proc but with extra pain multiplier. if you want to remove it less painfully, examine and remove it carefully. return TRUE //Hands are occupied - return /mob/living/carbon/human/proc/remove_embedded_unsafe(obj/item/bodypart/L, obj/item/I, mob/user, painmul = 1) if(!I || !L || I.loc != src || !(I in L.embedded_objects))