Fix some inconsistencies relating to resting
This commit is contained in:
@@ -377,10 +377,17 @@
|
||||
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)
|
||||
<<<<<<< HEAD
|
||||
NS.lay_down(TRUE) //specifically excludes silicons to prevent pAI chat spam
|
||||
time--*/ //CIT CHANGE -- replaces dance4 with rapid spinning so that disco balls dont make weird shit happen
|
||||
M.SpinAnimation(1,30)
|
||||
=======
|
||||
NS.resting = !NS.resting
|
||||
NS.update_canmove()
|
||||
time--
|
||||
>>>>>>> 78db4ed... Merge pull request #37960 from AutomaticFrenzy/patch/resting
|
||||
|
||||
/obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M)
|
||||
animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user