Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo

dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
parent 723decec2b b7673e234f
commit 7d0c3df2ad
33 changed files with 330 additions and 241 deletions
@@ -37,7 +37,7 @@
 			return BULLET_ACT_BLOCK
 		if(iscarbon(target))
 			var/mob/living/carbon/C = target
-			if(!is_species(C, /datum/species/dullahan)) //No accidental instagibbing dullahans please
+			if(HAS_TRAIT(C, TRAIT_DULLAHAN)) //No accidental instagibbing dullahans please
 				C.regenerate_limbs()
 			C.regenerate_organs()
 		if(target.revive(full_heal = 1))