From 92ff9b49abcd80689fd60802f564e2aace0c4a25 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com> Date: Sun, 29 Oct 2023 11:42:54 +0300 Subject: [PATCH] [MIRROR] Your unarmed attacks are once again blocked even when you're not in combat mode [MDB IGNORE] (#333) * Your unarmed attacks are once again blocked even when you're not in combat mode (#79233) --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> --- code/modules/mob/living/carbon/human/_species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index f7e9526b299..f443d57b271 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -1274,7 +1274,7 @@ GLOBAL_LIST_EMPTY(features_by_species) return if(owner.mind) attacker_style = owner.mind.martial_art - if((owner != target) && owner.combat_mode && target.check_shields(owner, 0, owner.name, attack_type = UNARMED_ATTACK)) + if((owner != target) && target.check_shields(owner, 0, owner.name, attack_type = UNARMED_ATTACK)) log_combat(owner, target, "attempted to touch") target.visible_message(span_warning("[owner] attempts to touch [target]!"), \ span_danger("[owner] attempts to touch you!"), span_hear("You hear a swoosh!"), COMBAT_MESSAGE_RANGE, owner)