Merge remote-tracking branch 'Arturlang/Garlic' into Garlic

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -252,7 +252,7 @@
 		return 0
 	if(M.getorgan(/obj/item/organ/alien/hivenode))
 		return 0
-	if(isvamp(M))
+	if(isbloodsucker(M))
 		return 0
 		
 	if(ismonkey(M))

code/modules/mob/living/carbon/carbon.dm

@@ -837,7 +837,7 @@
 /mob/living/carbon/proc/can_defib()
 	var/tlimit = DEFIB_TIME_LIMIT * 10
 	var/obj/item/organ/heart = getorgan(/obj/item/organ/heart)
-	if(suiciding || hellbound || HAS_TRAIT(src, TRAIT_HUSK))
+	if(suiciding || hellbound || HAS_TRAIT(src, TRAIT_HUSK) || isbloodsucker())
 		return
 	if((world.time - timeofdeath) > tlimit)
 		return