Merge pull request #10011 from Arturlang/Bloodsuckers

Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
parent 7ee71f9702 58f4f58cd2
commit c39a5d0462
104 changed files with 6026 additions and 35 deletions
@@ -180,7 +180,7 @@
 				else
 					new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color())

-			if(iscarbon(L))
+			if(iscarbon(L) && !HAS_TRAIT(L, TRAIT_NOMARROW))
 				var/mob/living/carbon/C = L
 				C.bleed(damage)
 			else