shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6

Browse Source 
Shuffles around and buffs resisting embedded objects
This commit is contained in:
Ghom
2020-04-18 05:34:58 +02:00
committed by GitHub
parent 0e55de55a7 b69c0944c9
commit 775948eed3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/carbon/human/human.dm
+3 -4
View File
@@ -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))