From e930b98bebb679109c60d0c65cc3b95469cc2f9b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 4 Apr 2018 16:59:18 -0400 Subject: [PATCH] Update dance_machine.dm --- code/game/machinery/dance_machine.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index ec46fcd291..cc5e11f7da 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -368,13 +368,9 @@ M.lying_fix() -<<<<<<< HEAD -/obj/machinery/disco/proc/dance4(var/mob/living/M) - //var/speed = rand(1,3) // CIT CHANGE -======= + /obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M) - var/speed = rand(1,3) ->>>>>>> 4471461... Refactors Dance Machine + deletes a bunch of sound files (#36815) + //var/speed = rand(1,3) CIT CHANGE -- comments this out to prevent compiling errors set waitfor = 0 /*var/time = 30 CIT CHANGE -- replaces dance4 with rapid spinning so that disco balls dont make weird shit happen while(time)