diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm index 65c314d4fc9..5b72c3c21e0 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -178,6 +178,10 @@ return FALSE if(action_disabled) return FALSE + if((check_flags & AB_CHECK_CONSCIOUS) && owner.stat != CONSCIOUS) + if (feedback) + owner.balloon_alert(owner, "[owner.stat == DEAD ? "dead" : "unconscious"]!") + return FALSE if((check_flags & AB_CHECK_HANDS_BLOCKED) && HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED)) if (feedback) owner.balloon_alert(owner, "hands blocked!") @@ -196,10 +200,6 @@ if (feedback) owner.balloon_alert(owner, "must stand up!") return FALSE - if((check_flags & AB_CHECK_CONSCIOUS) && owner.stat != CONSCIOUS) - if (feedback) - owner.balloon_alert(owner, "unconscious!") - return FALSE if((check_flags & AB_CHECK_PHASED) && HAS_TRAIT(owner, TRAIT_MAGICALLY_PHASED)) if (feedback) owner.balloon_alert(owner, "incorporeal!")