Merge pull request #7304 from KillianKirilenko/kk-bio

Offload Defibrillatability from NO_SCAN
This commit is contained in:
Atermonera
2020-06-25 12:44:20 -07:00
committed by VirgoBot
parent f4456eaa54
commit 5fbc4f3189
11 changed files with 26 additions and 20 deletions

View File

@@ -271,8 +271,8 @@
//Checks for various conditions to see if the mob is revivable
/obj/item/weapon/shockpaddles/proc/can_defib(mob/living/carbon/human/H) //This is checked before doing the defib operation
if((H.species.flags & NO_SCAN))
return "buzzes, \"Unrecogized physiology. Operation aborted.\""
if((H.species.flags & NO_DEFIB))
return "buzzes, \"Incompatible physiology. Operation aborted.\""
else if(H.isSynthetic() && !use_on_synthetic)
return "buzzes, \"Synthetic Body. Operation aborted.\""
else if(!H.isSynthetic() && use_on_synthetic)