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

Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960

Browse Source 
[MIRROR] Fix some inconsistencies relating to resting
This commit is contained in:
LetterJay
2018-05-27 14:39:18 -05:00
committed by GitHub
parent 42fa4e36d5 e544f0fe29
commit 761035b391
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+2 -1
View File
@@ -101,7 +101,8 @@
/obj/structure/table/proc/tableplace(mob/living/user, mob/living/pushed_mob)
pushed_mob.forceMove(src.loc)
pushed_mob.lay_down()
pushed_mob.resting = TRUE
pushed_mob.update_canmove()
pushed_mob.visible_message("<span class='notice'>[user] places [pushed_mob] onto [src].</span>", \
"<span class='notice'>[user] places [pushed_mob] onto [src].</span>")
add_logs(user, pushed_mob, "placed")