From 041cd3f3f3ed3c8ae826c5901833a4d966486d8e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 2 Jan 2015 18:58:52 +1030 Subject: [PATCH] Fixes #7629 --- code/modules/mob/living/carbon/human/species/species.dm | 2 +- code/modules/mob/living/living.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 64783251ef..8bdfa8a59d 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -204,7 +204,7 @@ // Called when using the shredding behavior. /datum/species/proc/can_shred(var/mob/living/carbon/human/H, var/ignore_intent) - if(ignore_intent && H.a_intent != "hurt") + if(!ignore_intent && H.a_intent != "hurt") return 0 for(var/datum/unarmed_attack/attack in unarmed_attacks) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a82aefe9f5..98512d92fc 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -640,7 +640,7 @@ can_break_cuffs = 1 else if(istype(CM,/mob/living/carbon/human)) var/mob/living/carbon/human/H = CM - if(H.species.can_shred(H)) + if(H.species.can_shred(H,1)) can_break_cuffs = 1 if(can_break_cuffs) //Don't want to do a lot of logic gating here.