shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/robot/robot_items.dm
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