diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/update_icons.dm index d1c9fa7cde..e6e7e657e8 100644 --- a/code/modules/mob/living/carbon/alien/larva/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/larva/update_icons.dm @@ -14,7 +14,7 @@ icon_state = "larva[state]_dead" else if(handcuffed || legcuffed) //This should be an overlay. Who made this an icon_state? icon_state = "larva[state]_cuff" - else if(stat == UNCONSCIOUS || lying || resting) + else if(stat == UNCONSCIOUS || !CHECK_MOBILITY(src, MOBILITY_STAND)) icon_state = "larva[state]_sleep" else if(IsStun() || IsParalyzed()) icon_state = "larva[state]_stun" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 47ce6b627c..bd7cbb48f9 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -491,7 +491,7 @@ to_chat(usr, "Unable to locate a data core entry for this person.") /mob/living/carbon/human/proc/canUseHUD() - return (mobility_flags & MOBILITY_UI) + return CHECK_MOBILITY(src, MOBILITY_UI) /mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE) . = 1 // Default to returning true. @@ -725,7 +725,7 @@ cut_overlay(MA) /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE, check_resting = TRUE) - if(incapacitated() || (check_resting && resting)) + if(incapacitated() || (check_resting && !CHECK_MOBILITY(src, MOBILITY_STAND))) to_chat(src, "You can't do that right now!") return FALSE if(!Adjacent(M) && (M.loc != src))