Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815

[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
parent f780b4dc99 4636817ab5
commit a275a787c1
12 changed files with 133 additions and 115 deletions
@@ -113,7 +113,7 @@
 /turf/open/floor/mineral/plasma,
 /area/shuttle/escape)
 "v" = (
-/obj/machinery/disco/indestructible,
+/obj/machinery/jukebox/disco/indestructible,
 /turf/open/floor/light/colour_cycle,
 /area/shuttle/escape)
 "w" = (