From 44ff7482f9e26014ceea4f25950c479cb5787940 Mon Sep 17 00:00:00 2001 From: Twinmold Date: Fri, 8 Jul 2016 02:59:18 -0500 Subject: [PATCH] The Sleeping Carp Vampires There is a small chance someone who is a vampire will also get traitor, or vice versa. If they get the martial art scroll (sleeping carp), they are unable to harm intent the head to drink their blood anymore. This makes it so they can if they have sleeping carp. --- code/modules/martial_arts/sleeping_carp.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index bc4e15eb598..9feca91e3ea 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -113,6 +113,8 @@ /datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H",D) + if((A.mind in ticker.mode.vampires)&(A.zone_sel.selecting == "head")) + return 0 if(check_streak(A,D)) return 1 A.do_attack_animation(D)