From ea8cebfd5e519ddb4e7ffcc7209c10a4a61d4d99 Mon Sep 17 00:00:00 2001 From: nicetoolbox Date: Sun, 16 Sep 2018 12:14:01 -0700 Subject: [PATCH] Fix human grabbedby not returning the grab --- code/modules/martial_arts/sleeping_carp.dm | 3 +-- code/modules/mob/living/carbon/human/human_defense.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index a6cd25d50c0..38f1dba77b9 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -108,8 +108,7 @@ add_to_streak("G",D) if(check_streak(A,D)) return 1 - D.grabbedby(A,1) - var/obj/item/grab/G = A.get_active_hand() + var/obj/item/grab/G = D.grabbedby(A,1) if(G) G.state = GRAB_AGGRESSIVE //Instant aggressive grab diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 6c2bb844155..b8e209498c2 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -178,7 +178,7 @@ emp_act /mob/living/carbon/human/grabbedby(mob/living/user) if(w_uniform) w_uniform.add_fingerprint(user) - ..() + return ..() //Returns 1 if the attack hit, 0 if it missed. /mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, def_zone)