From d5822a4cbb21595b08b6d75d8103d618e6caecfd Mon Sep 17 00:00:00 2001 From: Gaz Wilmbroke <308be59e@opayq.com> Date: Mon, 26 Mar 2018 17:18:35 -0500 Subject: [PATCH 1/2] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam --- code/game/machinery/dance_machine.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index bd41e3aa3a..c17c349106 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -407,9 +407,15 @@ sleep(speed) for(var/i in 1 to speed) M.setDir(pick(GLOB.cardinals)) +<<<<<<< HEAD M.lay_down(TRUE) time--*/ M.SpinAnimation(1,30) +======= + for(var/mob/living/carbon/NS in rangers) + NS.lay_down(TRUE) //specifically excludes silicons to prevent pAI chat spam + time-- +>>>>>>> 3f5438f... Cheapshit hack to fix pAI dance chatspam (#36689) /obj/machinery/disco/proc/dance5(var/mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) From 7977ac28185dd029961bc14f383043e2e9618db2 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 27 Mar 2018 13:50:40 -0400 Subject: [PATCH 2/2] Update dance_machine.dm --- code/game/machinery/dance_machine.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index c17c349106..c2519d8a88 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -407,15 +407,10 @@ sleep(speed) for(var/i in 1 to speed) M.setDir(pick(GLOB.cardinals)) -<<<<<<< HEAD - M.lay_down(TRUE) - time--*/ - M.SpinAnimation(1,30) -======= for(var/mob/living/carbon/NS in rangers) NS.lay_down(TRUE) //specifically excludes silicons to prevent pAI chat spam - time-- ->>>>>>> 3f5438f... Cheapshit hack to fix pAI dance chatspam (#36689) + time--*/ + M.SpinAnimation(1,30) /obj/machinery/disco/proc/dance5(var/mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)