From 80e13526325ef1d53721b1a455c3a749ac9c1291 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Sun, 20 May 2018 23:13:50 -0700 Subject: [PATCH] Fix some inconsistencies relating to resting --- code/game/machinery/dance_machine.dm | 4 +++- code/game/objects/structures/tables_racks.dm | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index aaa41ba05ad..750d83eeccc 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -376,8 +376,10 @@ sleep(speed) for(var/i in 1 to speed) M.setDir(pick(GLOB.cardinals)) + // update resting manually to avoid chat spam for(var/mob/living/carbon/NS in rangers) - NS.lay_down(TRUE) //specifically excludes silicons to prevent pAI chat spam + NS.resting = !NS.resting + NS.update_canmove() time-- /obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c20168f52ce..95c1cafd5dc 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -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("[user] places [pushed_mob] onto [src].", \ "[user] places [pushed_mob] onto [src].") add_logs(user, pushed_mob, "placed")