Fix merge conflicts

2026-08-30 07:27:57 +01:00 · 2015-09-27 11:24:51 -04:00
parent 0a7f50bbe2 b7680a4dfe
commit 0ceaf664af
227 changed files with 8312 additions and 7536 deletions
@@ -18,6 +18,10 @@
 	qdel(song)
 	song = null
 	return ..()
+	
+/obj/item/device/violin/initialize()
+	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
+	..()

 /obj/item/device/violin/attack_self(mob/user as mob)
 	interact(user)