From 2bcfe00283395967bec222baeba4d2df01f3f668 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 25 May 2018 11:56:08 -0400 Subject: [PATCH 1/3] Fix some inconsistencies relating to resting --- code/game/machinery/dance_machine.dm | 7 +++++++ code/game/objects/structures/tables_racks.dm | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 0ac97f597b..97a5890e88 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -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) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c20168f52c..95c1cafd5d 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") From 393676aa3ef99bd1e6f2eaf9201917ab3563b806 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 26 May 2018 18:39:20 -0500 Subject: [PATCH 2/3] Update dance_machine.dm --- code/game/machinery/dance_machine.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 97a5890e88..e200b5b36b 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -379,15 +379,9 @@ 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) From e544f0fe29ffcc770673f29dbc760df7b43f1da3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 26 May 2018 21:40:10 -0500 Subject: [PATCH 3/3] Update dance_machine.dm --- code/game/machinery/dance_machine.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index e200b5b36b..750d83eecc 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -368,11 +368,10 @@ M.lying_fix() - /obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M) - //var/speed = rand(1,3) CIT CHANGE -- comments this out to prevent compiling errors + var/speed = rand(1,3) set waitfor = 0 - /*var/time = 30 + var/time = 30 while(time) sleep(speed) for(var/i in 1 to speed)