From 7977ac28185dd029961bc14f383043e2e9618db2 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 27 Mar 2018 13:50:40 -0400
Subject: [PATCH] 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)