Skip to content

Commit

Permalink
Fix sleeping carp not properly detecting combat mode (Monkestation#1513)
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy authored Apr 3, 2024
1 parent 494c5b0 commit ed42059
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/datums/martial/sleeping_carp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@
return ..()

/datum/martial_art/the_sleeping_carp/proc/can_deflect(mob/living/carp_user)
if(!can_use(carp_user) || !((carp_user.istate & ISTATE_HARM|ISTATE_BLOCKING) || carp_user.throw_mode)) // monke edit: istates/intents
if(!can_use(carp_user))
return FALSE
if(!(carp_user.istate & ISTATE_HARM)) // monke edit: istates/intents
return FALSE
if(carp_user.incapacitated(IGNORE_GRAB)) //NO STUN
return FALSE
Expand Down

0 comments on commit ed42059

Please sign in to comment.