From f4e49f339bc57b4066ad3502822360d8bcb19122 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 27 Feb 2020 18:29:27 -0700 Subject: [PATCH] k --- code/modules/mob/living/carbon/human/human_mobility.dm | 5 ++++- code/modules/mob/living/living_mobility.dm | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_mobility.dm b/code/modules/mob/living/carbon/human/human_mobility.dm index c9074e5797..36fde353b9 100644 --- a/code/modules/mob/living/carbon/human/human_mobility.dm +++ b/code/modules/mob/living/carbon/human/human_mobility.dm @@ -4,7 +4,10 @@ if(ignoretimer) set_resting(FALSE, FALSE) return TRUE - else if(!CHECK_MOBILITY(src, MOBILITY_MOVE)) + if(!lying) //if they're in a chair or something they don't need to force themselves off the ground. + set_resting(FALSE, FALSE) + return TRUE + else if(!CHECK_MOBILITY(src, MOBILITY_RESIST)) to_chat(src, "You are unable to stand up right now.") else var/totaldelay = 3 //A little bit less than half of a second as a baseline for getting up from a rest diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm index 6222ee4ab7..86bd6c7a3a 100644 --- a/code/modules/mob/living/living_mobility.dm +++ b/code/modules/mob/living/living_mobility.dm @@ -70,8 +70,9 @@ var/chokehold = pulledby && pulledby.grab_state >= GRAB_NECK var/restrained = restrained() var/pinned = resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground - var/canmove = !immobilize && !stun && conscious && !paralyze && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && (has_arms || ignore_legs || has_legs) && !pinned && !recoveringstam - var/canresist = !stun && conscious && !stat_softcrit && !paralyze && (has_arms || ignore_legs || has_legs) && !recoveringstam + var/has_limbs = has_arms || ignore_legs || has_legs + var/canmove = !immobilize && !stun && conscious && !paralyze && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && has_limbs && !pinned && !recoveringstam + var/canresist = !stun && conscious && !stat_softcrit && !paralyze && has_limbs && !recoveringstam if(canmove) mobility_flags |= MOBILITY_MOVE