Skip to content

Commit

Permalink
[MIRROR] Your unarmed attacks are once again blocked even when you're…
Browse files Browse the repository at this point in the history
… 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 <[email protected]>
  • Loading branch information
Steals-The-PRs and necromanceranne authored Oct 29, 2023
1 parent c211a94 commit 92ff9b4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 92ff9b4

Please sign in to comment.