you're too exhausted to be lifted up - makes it much harder to force someone to stand if they're in hard stamcrit (#7683)

This commit is contained in:
deathride58
2018-10-30 22:29:08 -04:00
committed by kevinz000
parent e37ccab514
commit 4c19f4a50a
4 changed files with 7 additions and 5 deletions

View File

@@ -82,7 +82,7 @@
else
user.visible_message("<span class='notice'>[user] hugs [M] to make [M.p_them()] feel better!</span>", \
"<span class='notice'>You hug [M] to make [M.p_them()] feel better!</span>")
if(M.resting)
if(M.resting && !M.recoveringstam)
M.resting = FALSE
M.update_canmove()
else
@@ -102,7 +102,7 @@
else
user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
"<span class='warning'>You hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...</span>")
if(M.resting)
if(M.resting && !M.recoveringstam)
M.resting = FALSE
M.update_canmove()
else

View File

@@ -21,7 +21,8 @@ In all, this is a lot like the monkey code. /N
switch(M.a_intent)
if ("help")
resting = 0
if(!recoveringstam)
resting = 0
AdjustStun(-60)
AdjustKnockdown(-60)
AdjustUnconscious(-60)

View File

@@ -26,7 +26,8 @@
else
if(stat == UNCONSCIOUS)
stat = CONSCIOUS
resting = 0
if(!recoveringstam)
resting = 0
adjust_blindness(-1)
update_canmove()
update_damage_hud()

View File

@@ -311,7 +311,7 @@
AdjustKnockdown(-60)
AdjustUnconscious(-60)
AdjustSleeping(-100)
if(resting)
if(resting && !recoveringstam)
resting = 0
update_canmove()