Merge pull request #457 from Fox-McCloud/Music-Updates

Music updates

code/game/atoms.dm

@@ -463,3 +463,9 @@ its easier to just keep the beam vertical.
 
 /atom/proc/checkpass(passflag)
 	return pass_flags&passflag
+
+/atom/proc/isinspace()
+	if(istype(get_turf(src), /turf/space))
+		return 1
+	else
+		return 0

code/game/objects/items/devices/violin.dm

@@ -7,396 +7,26 @@
 	icon_state = "violin"
 	item_state = "violin"
 	force = 10
-	var/datum/song/song
-	var/playing = 0
-	var/help = 0
-	var/edit = 1
-	var/repeat = 0
+	var/datum/song/handheld/song
 
-/obj/item/device/violin/proc/playnote(var/note as text)
-	//world << "Note: [note]"
-	var/soundfile
-	/*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically.
-	Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/
-	switch(note)
-		if("Cn1")	soundfile = 'sound/violin/Cn1.mid'
-		if("C#1")	soundfile = 'sound/violin/C#1.mid'
-		if("Db1")	soundfile = 'sound/violin/Db1.mid'
-		if("Dn1")	soundfile = 'sound/violin/Dn1.mid'
-		if("D#1")	soundfile = 'sound/violin/D#1.mid'
-		if("Eb1")	soundfile = 'sound/violin/Eb1.mid'
-		if("En1")	soundfile = 'sound/violin/En1.mid'
-		if("E#1")	soundfile = 'sound/violin/E#1.mid'
-		if("Fb1")	soundfile = 'sound/violin/Fb1.mid'
-		if("Fn1")	soundfile = 'sound/violin/Fn1.mid'
-		if("F#1")	soundfile = 'sound/violin/F#1.mid'
-		if("Gb1")	soundfile = 'sound/violin/Gb1.mid'
-		if("Gn1")	soundfile = 'sound/violin/Gn1.mid'
-		if("G#1")	soundfile = 'sound/violin/G#1.mid'
-		if("Ab1")	soundfile = 'sound/violin/Ab1.mid'
-		if("An1")	soundfile = 'sound/violin/An1.mid'
-		if("A#1")	soundfile = 'sound/violin/A#1.mid'
-		if("Bb1")	soundfile = 'sound/violin/Bb1.mid'
-		if("Bn1")	soundfile = 'sound/violin/Bn1.mid'
-		if("B#1")	soundfile = 'sound/violin/B#1.mid'
-		if("Cb2")	soundfile = 'sound/violin/Cb2.mid'
-		if("Cn2")	soundfile = 'sound/violin/Cn2.mid'
-		if("C#2")	soundfile = 'sound/violin/C#2.mid'
-		if("Db2")	soundfile = 'sound/violin/Db2.mid'
-		if("Dn2")	soundfile = 'sound/violin/Dn2.mid'
-		if("D#2")	soundfile = 'sound/violin/D#2.mid'
-		if("Eb2")	soundfile = 'sound/violin/Eb2.mid'
-		if("En2")	soundfile = 'sound/violin/En2.mid'
-		if("E#2")	soundfile = 'sound/violin/E#2.mid'
-		if("Fb2")	soundfile = 'sound/violin/Fb2.mid'
-		if("Fn2")	soundfile = 'sound/violin/Fn2.mid'
-		if("F#2")	soundfile = 'sound/violin/F#2.mid'
-		if("Gb2")	soundfile = 'sound/violin/Gb2.mid'
-		if("Gn2")	soundfile = 'sound/violin/Gn2.mid'
-		if("G#2")	soundfile = 'sound/violin/G#2.mid'
-		if("Ab2")	soundfile = 'sound/violin/Ab2.mid'
-		if("An2")	soundfile = 'sound/violin/An2.mid'
-		if("A#2")	soundfile = 'sound/violin/A#2.mid'
-		if("Bb2")	soundfile = 'sound/violin/Bb2.mid'
-		if("Bn2")	soundfile = 'sound/violin/Bn2.mid'
-		if("B#2")	soundfile = 'sound/violin/B#2.mid'
-		if("Cb3")	soundfile = 'sound/violin/Cb3.mid'
-		if("Cn3")	soundfile = 'sound/violin/Cn3.mid'
-		if("C#3")	soundfile = 'sound/violin/C#3.mid'
-		if("Db3")	soundfile = 'sound/violin/Db3.mid'
-		if("Dn3")	soundfile = 'sound/violin/Dn3.mid'
-		if("D#3")	soundfile = 'sound/violin/D#3.mid'
-		if("Eb3")	soundfile = 'sound/violin/Eb3.mid'
-		if("En3")	soundfile = 'sound/violin/En3.mid'
-		if("E#3")	soundfile = 'sound/violin/E#3.mid'
-		if("Fb3")	soundfile = 'sound/violin/Fb3.mid'
-		if("Fn3")	soundfile = 'sound/violin/Fn3.mid'
-		if("F#3")	soundfile = 'sound/violin/F#3.mid'
-		if("Gb3")	soundfile = 'sound/violin/Gb3.mid'
-		if("Gn3")	soundfile = 'sound/violin/Gn3.mid'
-		if("G#3")	soundfile = 'sound/violin/G#3.mid'
-		if("Ab3")	soundfile = 'sound/violin/Ab3.mid'
-		if("An3")	soundfile = 'sound/violin/An3.mid'
-		if("A#3")	soundfile = 'sound/violin/A#3.mid'
-		if("Bb3")	soundfile = 'sound/violin/Bb3.mid'
-		if("Bn3")	soundfile = 'sound/violin/Bn3.mid'
-		if("B#3")	soundfile = 'sound/violin/B#3.mid'
-		if("Cb4")	soundfile = 'sound/violin/Cb4.mid'
-		if("Cn4")	soundfile = 'sound/violin/Cn4.mid'
-		if("C#4")	soundfile = 'sound/violin/C#4.mid'
-		if("Db4")	soundfile = 'sound/violin/Db4.mid'
-		if("Dn4")	soundfile = 'sound/violin/Dn4.mid'
-		if("D#4")	soundfile = 'sound/violin/D#4.mid'
-		if("Eb4")	soundfile = 'sound/violin/Eb4.mid'
-		if("En4")	soundfile = 'sound/violin/En4.mid'
-		if("E#4")	soundfile = 'sound/violin/E#4.mid'
-		if("Fb4")	soundfile = 'sound/violin/Fb4.mid'
-		if("Fn4")	soundfile = 'sound/violin/Fn4.mid'
-		if("F#4")	soundfile = 'sound/violin/F#4.mid'
-		if("Gb4")	soundfile = 'sound/violin/Gb4.mid'
-		if("Gn4")	soundfile = 'sound/violin/Gn4.mid'
-		if("G#4")	soundfile = 'sound/violin/G#4.mid'
-		if("Ab4")	soundfile = 'sound/violin/Ab4.mid'
-		if("An4")	soundfile = 'sound/violin/An4.mid'
-		if("A#4")	soundfile = 'sound/violin/A#4.mid'
-		if("Bb4")	soundfile = 'sound/violin/Bb4.mid'
-		if("Bn4")	soundfile = 'sound/violin/Bn4.mid'
-		if("B#4")	soundfile = 'sound/violin/B#4.mid'
-		if("Cb5")	soundfile = 'sound/violin/Cb5.mid'
-		if("Cn5")	soundfile = 'sound/violin/Cn5.mid'
-		if("C#5")	soundfile = 'sound/violin/C#5.mid'
-		if("Db5")	soundfile = 'sound/violin/Db5.mid'
-		if("Dn5")	soundfile = 'sound/violin/Dn5.mid'
-		if("D#5")	soundfile = 'sound/violin/D#5.mid'
-		if("Eb5")	soundfile = 'sound/violin/Eb5.mid'
-		if("En5")	soundfile = 'sound/violin/En5.mid'
-		if("E#5")	soundfile = 'sound/violin/E#5.mid'
-		if("Fb5")	soundfile = 'sound/violin/Fb5.mid'
-		if("Fn5")	soundfile = 'sound/violin/Fn5.mid'
-		if("F#5")	soundfile = 'sound/violin/F#5.mid'
-		if("Gb5")	soundfile = 'sound/violin/Gb5.mid'
-		if("Gn5")	soundfile = 'sound/violin/Gn5.mid'
-		if("G#5")	soundfile = 'sound/violin/G#5.mid'
-		if("Ab5")	soundfile = 'sound/violin/Ab5.mid'
-		if("An5")	soundfile = 'sound/violin/An5.mid'
-		if("A#5")	soundfile = 'sound/violin/A#5.mid'
-		if("Bb5")	soundfile = 'sound/violin/Bb5.mid'
-		if("Bn5")	soundfile = 'sound/violin/Bn5.mid'
-		if("B#5")	soundfile = 'sound/violin/B#5.mid'
-		if("Cb6")	soundfile = 'sound/violin/Cb6.mid'
-		if("Cn6")	soundfile = 'sound/violin/Cn6.mid'
-		if("C#6")	soundfile = 'sound/violin/C#6.mid'
-		if("Db6")	soundfile = 'sound/violin/Db6.mid'
-		if("Dn6")	soundfile = 'sound/violin/Dn6.mid'
-		if("D#6")	soundfile = 'sound/violin/D#6.mid'
-		if("Eb6")	soundfile = 'sound/violin/Eb6.mid'
-		if("En6")	soundfile = 'sound/violin/En6.mid'
-		if("E#6")	soundfile = 'sound/violin/E#6.mid'
-		if("Fb6")	soundfile = 'sound/violin/Fb6.mid'
-		if("Fn6")	soundfile = 'sound/violin/Fn6.mid'
-		if("F#6")	soundfile = 'sound/violin/F#6.mid'
-		if("Gb6")	soundfile = 'sound/violin/Gb6.mid'
-		if("Gn6")	soundfile = 'sound/violin/Gn6.mid'
-		if("G#6")	soundfile = 'sound/violin/G#6.mid'
-		if("Ab6")	soundfile = 'sound/violin/Ab6.mid'
-		if("An6")	soundfile = 'sound/violin/An6.mid'
-		if("A#6")	soundfile = 'sound/violin/A#6.mid'
-		if("Bb6")	soundfile = 'sound/violin/Bb6.mid'
-		if("Bn6")	soundfile = 'sound/violin/Bn6.mid'
-		if("B#6")	soundfile = 'sound/violin/B#6.mid'
-		if("Cb7")	soundfile = 'sound/violin/Cb7.mid'
-		if("Cn7")	soundfile = 'sound/violin/Cn7.mid'
-		if("C#7")	soundfile = 'sound/violin/C#7.mid'
-		if("Db7")	soundfile = 'sound/violin/Db7.mid'
-		if("Dn7")	soundfile = 'sound/violin/Dn7.mid'
-		if("D#7")	soundfile = 'sound/violin/D#7.mid'
-		if("Eb7")	soundfile = 'sound/violin/Eb7.mid'
-		if("En7")	soundfile = 'sound/violin/En7.mid'
-		if("E#7")	soundfile = 'sound/violin/E#7.mid'
-		if("Fb7")	soundfile = 'sound/violin/Fb7.mid'
-		if("Fn7")	soundfile = 'sound/violin/Fn7.mid'
-		if("F#7")	soundfile = 'sound/violin/F#7.mid'
-		if("Gb7")	soundfile = 'sound/violin/Gb7.mid'
-		if("Gn7")	soundfile = 'sound/violin/Gn7.mid'
-		if("G#7")	soundfile = 'sound/violin/G#7.mid'
-		if("Ab7")	soundfile = 'sound/violin/Ab7.mid'
-		if("An7")	soundfile = 'sound/violin/An7.mid'
-		if("A#7")	soundfile = 'sound/violin/A#7.mid'
-		if("Bb7")	soundfile = 'sound/violin/Bb7.mid'
-		if("Bn7")	soundfile = 'sound/violin/Bn7.mid'
-		if("B#7")	soundfile = 'sound/violin/B#7.mid'
-		if("Cb8")	soundfile = 'sound/violin/Cb8.mid'
-		if("Cn8")	soundfile = 'sound/violin/Cn8.mid'
-		if("C#8")	soundfile = 'sound/violin/C#8.mid'
-		if("Db8")	soundfile = 'sound/violin/Db8.mid'
-		if("Dn8")	soundfile = 'sound/violin/Dn8.mid'
-		if("D#8")	soundfile = 'sound/violin/D#8.mid'
-		if("Eb8")	soundfile = 'sound/violin/Eb8.mid'
-		if("En8")	soundfile = 'sound/violin/En8.mid'
-		if("E#8")	soundfile = 'sound/violin/E#8.mid'
-		if("Fb8")	soundfile = 'sound/violin/Fb8.mid'
-		if("Fn8")	soundfile = 'sound/violin/Fn8.mid'
-		if("F#8")	soundfile = 'sound/violin/F#8.mid'
-		if("Gb8")	soundfile = 'sound/violin/Gb8.mid'
-		if("Gn8")	soundfile = 'sound/violin/Gn8.mid'
-		if("G#8")	soundfile = 'sound/violin/G#8.mid'
-		if("Ab8")	soundfile = 'sound/violin/Ab8.mid'
-		if("An8")	soundfile = 'sound/violin/An8.mid'
-		if("A#8")	soundfile = 'sound/violin/A#8.mid'
-		if("Bb8")	soundfile = 'sound/violin/Bb8.mid'
-		if("Bn8")	soundfile = 'sound/violin/Bn8.mid'
-		if("B#8")	soundfile = 'sound/violin/B#8.mid'
-		if("Cb9")	soundfile = 'sound/violin/Cb9.mid'
-		if("Cn9")	soundfile = 'sound/violin/Cn9.mid'
-		else		return
+/obj/item/device/violin/New()
+	song = new("violin", src)
+	song.instrumentExt = "ogg"
 
-	hearers(15, get_turf(src)) << sound(soundfile)
-
-/obj/item/device/violin/proc/playsong()
-	do
-		var/cur_oct[7]
-		var/cur_acc[7]
-		for(var/i = 1 to 7)
-			cur_oct[i] = "3"
-			cur_acc[i] = "n"
-
-		for(var/line in song.lines)
-			//world << line
-			for(var/beat in text2list(lowertext(line), ","))
-				//world << "beat: [beat]"
-				var/list/notes = text2list(beat, "/")
-				for(var/note in text2list(notes[1], "-"))
-					//world << "note: [note]"
-					if(!playing || !isliving(loc))//If the violin is playing, or isn't held by a person
-						playing = 0
-						return
-					if(lentext(note) == 0)
-						continue
-					//world << "Parse: [copytext(note,1,2)]"
-					var/cur_note = text2ascii(note) - 96
-					if(cur_note < 1 || cur_note > 7)
-						continue
-					for(var/i=2 to lentext(note))
-						var/ni = copytext(note,i,i+1)
-						if(!text2num(ni))
-							if(ni == "#" || ni == "b" || ni == "n")
-								cur_acc[cur_note] = ni
-							else if(ni == "s")
-								cur_acc[cur_note] = "#" // so shift is never required
-						else
-							cur_oct[cur_note] = ni
-					playnote(uppertext(copytext(note,1,2)) + cur_acc[cur_note] + cur_oct[cur_note])
-				if(notes.len >= 2 && text2num(notes[2]))
-					sleep(song.tempo / text2num(notes[2]))
-				else
-					sleep(song.tempo)
-		if(repeat > 0)
-			repeat-- //Infinite loops are baaaad.
-	while(repeat > 0)
-	playing = 0
+/obj/item/device/violin/Destroy()
+	del(song)
+	song = null
+	..()
 
 /obj/item/device/violin/attack_self(mob/user as mob)
-	if(!isliving(user) || user.stat || user.restrained() || user.lying)	return
-	user.set_machine(src)
+	interact(user)
 
-	var/dat = "<HEAD><TITLE>Violin</TITLE></HEAD><BODY>"
-
-	if(song)
-		if(song.lines.len > 0 && !(playing))
-			dat += "<A href='?src=\ref[src];play=1'>Play Song</A><BR><BR>"
-			dat += "<A href='?src=\ref[src];repeat=1'>Repeat Song: [repeat] times.</A><BR><BR>"
-		if(playing)
-			dat += "<A href='?src=\ref[src];stop=1'>Stop Playing</A><BR>"
-			dat += "Repeats left: [repeat].<BR><BR>"
-	if(!edit)
-		dat += "<A href='?src=\ref[src];edit=2'>Show Editor</A><BR><BR>"
-	else
-		dat += "<A href='?src=\ref[src];edit=1'>Hide Editor</A><BR>"
-		dat += "<A href='?src=\ref[src];newsong=1'>Start a New Song</A><BR>"
-		dat += "<A href='?src=\ref[src];import=1'>Import a Song</A><BR><BR>"
-		if(song)
-			var/calctempo = (10/song.tempo)*60
-			dat += "Tempo : <A href='?src=\ref[src];tempo=10'>-</A><A href='?src=\ref[src];tempo=1'>-</A> [calctempo] BPM <A href='?src=\ref[src];tempo=-1'>+</A><A href='?src=\ref[src];tempo=-10'>+</A><BR><BR>"
-			var/linecount = 0
-			for(var/line in song.lines)
-				linecount += 1
-				dat += "Line [linecount]: [line] <A href='?src=\ref[src];deleteline=[linecount]'>Delete Line</A> <A href='?src=\ref[src];modifyline=[linecount]'>Modify Line</A><BR>"
-			dat += "<A href='?src=\ref[src];newline=1'>Add Line</A><BR><BR>"
-		if(help)
-			dat += "<A href='?src=\ref[src];help=1'>Hide Help</A><BR>"
-			dat += {"
-					Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).<br>
-					Every note in a chord will play together, with chord timed by the tempo.<br>
-					<br>
-					Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.<br>
-					By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.<br>
-					Example: <i>C,D,E,F,G,A,B</i> will play a C major scale.<br>
-					After a note has an accidental placed, it will be remembered: <i>C,C4,C,C3</i> is C3,C4,C4,C3</i><br>
-					Chords can be played simply by seperating each note with a hyphon: <i>A-C#,Cn-E,E-G#,Gn-B</i><br>
-					A pause may be denoted by an empty chord: <i>C,E,,C,G</i><br>
-					To make a chord be a different time, end it with /x, where the chord length will be length<br>
-					defined by tempo / x: <i>C,G/2,E/4</i><br>
-					Combined, an example is: <i>E-E4/4,/2,G#/8,B/8,E3-E4/4</i>
-					<br>
-					Lines may be up to 50 characters.<br>
-					A song may only contain up to 50 lines.<br>
-					"}
-		else
-			dat += "<A href='?src=\ref[src];help=2'>Show Help</A><BR>"
-	dat += "</BODY></HTML>"
-	user << browse(dat, "window=violin;size=700x300")
-	onclose(user, "violin")
-
-/obj/item/device/violin/Topic(href, href_list)
-
-	if(!in_range(src, usr) || issilicon(usr) || !isliving(usr) || !usr.canmove || usr.restrained())
-		usr << browse(null, "window=violin;size=700x300")
-		onclose(usr, "violin")
+/obj/item/device/violin/interact(mob/user as mob)
+	if(!user)
 		return
 
-	if(href_list["newsong"])
-		song = new()
-	else if(song)
-		if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
-			if(playing) return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
-			var/tempnum = input("How many times do you want to repeat this piece? (max:10)") as num|null
-			if(tempnum > 10)
-				tempnum = 10
-			if(tempnum < 0)
-				tempnum = 0
-			repeat = round(tempnum)
+	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+		return
 
-		else if(href_list["tempo"])
-			song.tempo += round(text2num(href_list["tempo"]))
-			if(song.tempo < 1)
-				song.tempo = 1
-
-		else if(href_list["play"])
-			if(song)
-				playing = 1
-				spawn() playsong()
-
-		else if(href_list["newline"])
-			var/newline = html_encode(input("Enter your line: ", "violin") as text|null)
-			if(!newline)
-				return
-			if(song.lines.len > 50)
-				return
-			if(lentext(newline) > 50)
-				newline = copytext(newline, 1, 50)
-			song.lines.Add(newline)
-
-		else if(href_list["deleteline"])
-			var/num = round(text2num(href_list["deleteline"]))
-			if(num > song.lines.len || num < 1)
-				return
-			song.lines.Cut(num, num+1)
-
-		else if(href_list["modifyline"])
-			var/num = round(text2num(href_list["modifyline"]),1)
-			var/content = html_encode(input("Enter your line: ", "violin", song.lines[num]) as text|null)
-			if(!content)
-				return
-			if(lentext(content) > 50)
-				content = copytext(content, 1, 50)
-			if(num > song.lines.len || num < 1)
-				return
-			song.lines[num] = content
-
-		else if(href_list["stop"])
-			playing = 0
-
-		else if(href_list["help"])
-			help = text2num(href_list["help"]) - 1
-
-		else if(href_list["edit"])
-			edit = text2num(href_list["edit"]) - 1
-
-		else if(href_list["import"])
-			var/t = ""
-			do
-				t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t)  as message)
-				if(!in_range(src, usr))
-					return
-
-				if(lentext(t) >= 3072)
-					var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
-					if(cont == "no")
-						break
-			while(lentext(t) > 3072)
-
-			//split into lines
-			spawn()
-				var/list/lines = text2list(t, "\n")
-				var/tempo = 5
-				if(copytext(lines[1],1,6) == "BPM: ")
-					tempo = 600 / text2num(copytext(lines[1],6))
-					lines.Cut(1,2)
-				if(lines.len > 50)
-					usr << "Too many lines!"
-					lines.Cut(51)
-				var/linenum = 1
-				for(var/l in lines)
-					if(lentext(l) > 50)
-						usr << "Line [linenum] too long!"
-						lines.Remove(l)
-					else
-						linenum++
-				song = new()
-				song.lines = lines
-				song.tempo = tempo
-
-	add_fingerprint(usr)
-	for(var/mob/M in viewers(1, loc))
-		if((M.client && M.machine == src))
-			attack_self(M)
-	return
-
-
-/obj/item/device/violin/guitar
-	name = "engraved guitar"
-	desc = "An aged wooden acoustic guitar It has an engraving on the back: \"For my loyal robotic companion, S.A.M. -LWK\"."
-	icon = 'icons/obj/musician.dmi'
-	icon_state = "guitar"
-	item_state = "guitar"
-	slot_flags = SLOT_BACK
+	user.set_machine(src)
+	song.interact(user)

code/game/objects/structures/musician.dm

@@ -5,223 +5,86 @@
 	var/list/lines = new()
 	var/tempo = 5
 
-/obj/structure/device/piano
-	name = "space minimoog"
-	icon = 'icons/obj/musician.dmi'
-	icon_state = "minimoog"
-	anchored = 1
-	density = 1
-	var/datum/song/song
-	var/playing = 0
-	var/help = 0
-	var/edit = 1
-	var/repeat = 0
+	var/playing = 0			// if we're playing
+	var/help = 0			// if help is open
+	var/edit = 1			// if we're in editing mode
+	var/repeat = 0			// number of times remaining to repeat
+	var/max_repeats = 10	// maximum times we can repeat
 
-/obj/structure/device/piano/New()
-	if(prob(50))
-		name = "space minimoog"
-		desc = "This is a minimoog, like a space piano, but more spacey!"
-		icon_state = "minimoog"
+	var/instrumentDir = "piano"		// the folder with the sounds
+	var/instrumentExt = "ogg"		// the file extension
+	var/obj/instrumentObj = null	// the associated obj playing the sound
+
+/datum/song/New(dir, obj)
+	instrumentDir = dir
+	instrumentObj = obj
+
+/datum/song/proc/Destroy()
+	instrumentObj = null
+	return
+
+// note is a number from 1-7 for A-G
+// acc is either "b", "n", or "#"
+// oct is 1-8 (or 9 for C)
+/datum/song/proc/playnote(var/note, var/acc as text, var/oct)
+	// handle accidental -> B<>C of E<>F
+	if(acc == "b" && (note == 3 || note == 6)) // C or F
+		if(note == 3)
+			oct--
+		note--
+		acc = "n"
+	else if(acc == "#" && (note == 2 || note == 5)) // B or E
+		if(note == 2)
+			oct++
+		note++
+		acc = "n"
+	else if(acc == "#" && (note == 7)) //G#
+		note = 1
+		acc = "b"
+	else if(acc == "#") // mass convert all sharps to flats, octave jump already handled
+		acc = "b"
+		note++
+
+	// check octave, C is allowed to go to 9
+	if(oct < 1 || (note == 3 ? oct > 9 : oct > 8))
+		return
+
+	// now generate name
+	var/soundfile = "sound/[instrumentDir]/[ascii2text(note+64)][acc][oct].[instrumentExt]"
+	soundfile = file(soundfile)
+	// make sure the note exists
+	if(!fexists(soundfile))
+		return
+	// and play
+	var/turf/source = get_turf(instrumentObj)
+	for(var/mob/M in hearers(15, source))
+		M.playsound_local(source, soundfile, 100, falloff = 5)
+
+/datum/song/proc/updateDialog(mob/user as mob)
+	instrumentObj.updateDialog()		// assumes it's an object in world, override if otherwise
+
+/datum/song/proc/shouldStopPlaying()
+	if(instrumentObj)
+		return !instrumentObj.anchored		// add special cases to stop in subclasses
 	else
-		name = "space piano"
-		desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
-		icon_state = "piano"
+		return 1
 
-/obj/structure/device/piano/proc/playnote(var/note as text)
-	//world << "Note: [note]"
-	var/soundfile
-	/*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically.
-	Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/
-	switch(note)
-		if("Cn1")	soundfile = 'sound/piano/Cn1.ogg'
-		if("C#1")	soundfile = 'sound/piano/C#1.ogg'
-		if("Db1")	soundfile = 'sound/piano/Db1.ogg'
-		if("Dn1")	soundfile = 'sound/piano/Dn1.ogg'
-		if("D#1")	soundfile = 'sound/piano/D#1.ogg'
-		if("Eb1")	soundfile = 'sound/piano/Eb1.ogg'
-		if("En1")	soundfile = 'sound/piano/En1.ogg'
-		if("E#1")	soundfile = 'sound/piano/E#1.ogg'
-		if("Fb1")	soundfile = 'sound/piano/Fb1.ogg'
-		if("Fn1")	soundfile = 'sound/piano/Fn1.ogg'
-		if("F#1")	soundfile = 'sound/piano/F#1.ogg'
-		if("Gb1")	soundfile = 'sound/piano/Gb1.ogg'
-		if("Gn1")	soundfile = 'sound/piano/Gn1.ogg'
-		if("G#1")	soundfile = 'sound/piano/G#1.ogg'
-		if("Ab1")	soundfile = 'sound/piano/Ab1.ogg'
-		if("An1")	soundfile = 'sound/piano/An1.ogg'
-		if("A#1")	soundfile = 'sound/piano/A#1.ogg'
-		if("Bb1")	soundfile = 'sound/piano/Bb1.ogg'
-		if("Bn1")	soundfile = 'sound/piano/Bn1.ogg'
-		if("B#1")	soundfile = 'sound/piano/B#1.ogg'
-		if("Cb2")	soundfile = 'sound/piano/Cb2.ogg'
-		if("Cn2")	soundfile = 'sound/piano/Cn2.ogg'
-		if("C#2")	soundfile = 'sound/piano/C#2.ogg'
-		if("Db2")	soundfile = 'sound/piano/Db2.ogg'
-		if("Dn2")	soundfile = 'sound/piano/Dn2.ogg'
-		if("D#2")	soundfile = 'sound/piano/D#2.ogg'
-		if("Eb2")	soundfile = 'sound/piano/Eb2.ogg'
-		if("En2")	soundfile = 'sound/piano/En2.ogg'
-		if("E#2")	soundfile = 'sound/piano/E#2.ogg'
-		if("Fb2")	soundfile = 'sound/piano/Fb2.ogg'
-		if("Fn2")	soundfile = 'sound/piano/Fn2.ogg'
-		if("F#2")	soundfile = 'sound/piano/F#2.ogg'
-		if("Gb2")	soundfile = 'sound/piano/Gb2.ogg'
-		if("Gn2")	soundfile = 'sound/piano/Gn2.ogg'
-		if("G#2")	soundfile = 'sound/piano/G#2.ogg'
-		if("Ab2")	soundfile = 'sound/piano/Ab2.ogg'
-		if("An2")	soundfile = 'sound/piano/An2.ogg'
-		if("A#2")	soundfile = 'sound/piano/A#2.ogg'
-		if("Bb2")	soundfile = 'sound/piano/Bb2.ogg'
-		if("Bn2")	soundfile = 'sound/piano/Bn2.ogg'
-		if("B#2")	soundfile = 'sound/piano/B#2.ogg'
-		if("Cb3")	soundfile = 'sound/piano/Cb3.ogg'
-		if("Cn3")	soundfile = 'sound/piano/Cn3.ogg'
-		if("C#3")	soundfile = 'sound/piano/C#3.ogg'
-		if("Db3")	soundfile = 'sound/piano/Db3.ogg'
-		if("Dn3")	soundfile = 'sound/piano/Dn3.ogg'
-		if("D#3")	soundfile = 'sound/piano/D#3.ogg'
-		if("Eb3")	soundfile = 'sound/piano/Eb3.ogg'
-		if("En3")	soundfile = 'sound/piano/En3.ogg'
-		if("E#3")	soundfile = 'sound/piano/E#3.ogg'
-		if("Fb3")	soundfile = 'sound/piano/Fb3.ogg'
-		if("Fn3")	soundfile = 'sound/piano/Fn3.ogg'
-		if("F#3")	soundfile = 'sound/piano/F#3.ogg'
-		if("Gb3")	soundfile = 'sound/piano/Gb3.ogg'
-		if("Gn3")	soundfile = 'sound/piano/Gn3.ogg'
-		if("G#3")	soundfile = 'sound/piano/G#3.ogg'
-		if("Ab3")	soundfile = 'sound/piano/Ab3.ogg'
-		if("An3")	soundfile = 'sound/piano/An3.ogg'
-		if("A#3")	soundfile = 'sound/piano/A#3.ogg'
-		if("Bb3")	soundfile = 'sound/piano/Bb3.ogg'
-		if("Bn3")	soundfile = 'sound/piano/Bn3.ogg'
-		if("B#3")	soundfile = 'sound/piano/B#3.ogg'
-		if("Cb4")	soundfile = 'sound/piano/Cb4.ogg'
-		if("Cn4")	soundfile = 'sound/piano/Cn4.ogg'
-		if("C#4")	soundfile = 'sound/piano/C#4.ogg'
-		if("Db4")	soundfile = 'sound/piano/Db4.ogg'
-		if("Dn4")	soundfile = 'sound/piano/Dn4.ogg'
-		if("D#4")	soundfile = 'sound/piano/D#4.ogg'
-		if("Eb4")	soundfile = 'sound/piano/Eb4.ogg'
-		if("En4")	soundfile = 'sound/piano/En4.ogg'
-		if("E#4")	soundfile = 'sound/piano/E#4.ogg'
-		if("Fb4")	soundfile = 'sound/piano/Fb4.ogg'
-		if("Fn4")	soundfile = 'sound/piano/Fn4.ogg'
-		if("F#4")	soundfile = 'sound/piano/F#4.ogg'
-		if("Gb4")	soundfile = 'sound/piano/Gb4.ogg'
-		if("Gn4")	soundfile = 'sound/piano/Gn4.ogg'
-		if("G#4")	soundfile = 'sound/piano/G#4.ogg'
-		if("Ab4")	soundfile = 'sound/piano/Ab4.ogg'
-		if("An4")	soundfile = 'sound/piano/An4.ogg'
-		if("A#4")	soundfile = 'sound/piano/A#4.ogg'
-		if("Bb4")	soundfile = 'sound/piano/Bb4.ogg'
-		if("Bn4")	soundfile = 'sound/piano/Bn4.ogg'
-		if("B#4")	soundfile = 'sound/piano/B#4.ogg'
-		if("Cb5")	soundfile = 'sound/piano/Cb5.ogg'
-		if("Cn5")	soundfile = 'sound/piano/Cn5.ogg'
-		if("C#5")	soundfile = 'sound/piano/C#5.ogg'
-		if("Db5")	soundfile = 'sound/piano/Db5.ogg'
-		if("Dn5")	soundfile = 'sound/piano/Dn5.ogg'
-		if("D#5")	soundfile = 'sound/piano/D#5.ogg'
-		if("Eb5")	soundfile = 'sound/piano/Eb5.ogg'
-		if("En5")	soundfile = 'sound/piano/En5.ogg'
-		if("E#5")	soundfile = 'sound/piano/E#5.ogg'
-		if("Fb5")	soundfile = 'sound/piano/Fb5.ogg'
-		if("Fn5")	soundfile = 'sound/piano/Fn5.ogg'
-		if("F#5")	soundfile = 'sound/piano/F#5.ogg'
-		if("Gb5")	soundfile = 'sound/piano/Gb5.ogg'
-		if("Gn5")	soundfile = 'sound/piano/Gn5.ogg'
-		if("G#5")	soundfile = 'sound/piano/G#5.ogg'
-		if("Ab5")	soundfile = 'sound/piano/Ab5.ogg'
-		if("An5")	soundfile = 'sound/piano/An5.ogg'
-		if("A#5")	soundfile = 'sound/piano/A#5.ogg'
-		if("Bb5")	soundfile = 'sound/piano/Bb5.ogg'
-		if("Bn5")	soundfile = 'sound/piano/Bn5.ogg'
-		if("B#5")	soundfile = 'sound/piano/B#5.ogg'
-		if("Cb6")	soundfile = 'sound/piano/Cb6.ogg'
-		if("Cn6")	soundfile = 'sound/piano/Cn6.ogg'
-		if("C#6")	soundfile = 'sound/piano/C#6.ogg'
-		if("Db6")	soundfile = 'sound/piano/Db6.ogg'
-		if("Dn6")	soundfile = 'sound/piano/Dn6.ogg'
-		if("D#6")	soundfile = 'sound/piano/D#6.ogg'
-		if("Eb6")	soundfile = 'sound/piano/Eb6.ogg'
-		if("En6")	soundfile = 'sound/piano/En6.ogg'
-		if("E#6")	soundfile = 'sound/piano/E#6.ogg'
-		if("Fb6")	soundfile = 'sound/piano/Fb6.ogg'
-		if("Fn6")	soundfile = 'sound/piano/Fn6.ogg'
-		if("F#6")	soundfile = 'sound/piano/F#6.ogg'
-		if("Gb6")	soundfile = 'sound/piano/Gb6.ogg'
-		if("Gn6")	soundfile = 'sound/piano/Gn6.ogg'
-		if("G#6")	soundfile = 'sound/piano/G#6.ogg'
-		if("Ab6")	soundfile = 'sound/piano/Ab6.ogg'
-		if("An6")	soundfile = 'sound/piano/An6.ogg'
-		if("A#6")	soundfile = 'sound/piano/A#6.ogg'
-		if("Bb6")	soundfile = 'sound/piano/Bb6.ogg'
-		if("Bn6")	soundfile = 'sound/piano/Bn6.ogg'
-		if("B#6")	soundfile = 'sound/piano/B#6.ogg'
-		if("Cb7")	soundfile = 'sound/piano/Cb7.ogg'
-		if("Cn7")	soundfile = 'sound/piano/Cn7.ogg'
-		if("C#7")	soundfile = 'sound/piano/C#7.ogg'
-		if("Db7")	soundfile = 'sound/piano/Db7.ogg'
-		if("Dn7")	soundfile = 'sound/piano/Dn7.ogg'
-		if("D#7")	soundfile = 'sound/piano/D#7.ogg'
-		if("Eb7")	soundfile = 'sound/piano/Eb7.ogg'
-		if("En7")	soundfile = 'sound/piano/En7.ogg'
-		if("E#7")	soundfile = 'sound/piano/E#7.ogg'
-		if("Fb7")	soundfile = 'sound/piano/Fb7.ogg'
-		if("Fn7")	soundfile = 'sound/piano/Fn7.ogg'
-		if("F#7")	soundfile = 'sound/piano/F#7.ogg'
-		if("Gb7")	soundfile = 'sound/piano/Gb7.ogg'
-		if("Gn7")	soundfile = 'sound/piano/Gn7.ogg'
-		if("G#7")	soundfile = 'sound/piano/G#7.ogg'
-		if("Ab7")	soundfile = 'sound/piano/Ab7.ogg'
-		if("An7")	soundfile = 'sound/piano/An7.ogg'
-		if("A#7")	soundfile = 'sound/piano/A#7.ogg'
-		if("Bb7")	soundfile = 'sound/piano/Bb7.ogg'
-		if("Bn7")	soundfile = 'sound/piano/Bn7.ogg'
-		if("B#7")	soundfile = 'sound/piano/B#7.ogg'
-		if("Cb8")	soundfile = 'sound/piano/Cb8.ogg'
-		if("Cn8")	soundfile = 'sound/piano/Cn8.ogg'
-		if("C#8")	soundfile = 'sound/piano/C#8.ogg'
-		if("Db8")	soundfile = 'sound/piano/Db8.ogg'
-		if("Dn8")	soundfile = 'sound/piano/Dn8.ogg'
-		if("D#8")	soundfile = 'sound/piano/D#8.ogg'
-		if("Eb8")	soundfile = 'sound/piano/Eb8.ogg'
-		if("En8")	soundfile = 'sound/piano/En8.ogg'
-		if("E#8")	soundfile = 'sound/piano/E#8.ogg'
-		if("Fb8")	soundfile = 'sound/piano/Fb8.ogg'
-		if("Fn8")	soundfile = 'sound/piano/Fn8.ogg'
-		if("F#8")	soundfile = 'sound/piano/F#8.ogg'
-		if("Gb8")	soundfile = 'sound/piano/Gb8.ogg'
-		if("Gn8")	soundfile = 'sound/piano/Gn8.ogg'
-		if("G#8")	soundfile = 'sound/piano/G#8.ogg'
-		if("Ab8")	soundfile = 'sound/piano/Ab8.ogg'
-		if("An8")	soundfile = 'sound/piano/An8.ogg'
-		if("A#8")	soundfile = 'sound/piano/A#8.ogg'
-		if("Bb8")	soundfile = 'sound/piano/Bb8.ogg'
-		if("Bn8")	soundfile = 'sound/piano/Bn8.ogg'
-		if("B#8")	soundfile = 'sound/piano/B#8.ogg'
-		if("Cb9")	soundfile = 'sound/piano/Cb9.ogg'
-		if("Cn9")	soundfile = 'sound/piano/Cn9.ogg'
-		else		return
-
-	hearers(15, src) << sound(soundfile)
-
-/obj/structure/device/piano/proc/playsong()
-	do
+/datum/song/proc/playsong(mob/user as mob)
+	while(repeat >= 0)
 		var/cur_oct[7]
 		var/cur_acc[7]
 		for(var/i = 1 to 7)
-			cur_oct[i] = "3"
+			cur_oct[i] = 3
 			cur_acc[i] = "n"
 
-		for(var/line in song.lines)
+		for(var/line in lines)
 			//world << line
 			for(var/beat in text2list(lowertext(line), ","))
 				//world << "beat: [beat]"
 				var/list/notes = text2list(beat, "/")
 				for(var/note in text2list(notes[1], "-"))
 					//world << "note: [note]"
-					if(!playing || !anchored)//If the piano is playing, or is loose
+					if(!playing || shouldStopPlaying())//If the instrument is playing, or special case
 						playing = 0
 						return
 					if(lentext(note) == 0)
@@ -238,48 +101,52 @@
 							else if(ni == "s")
 								cur_acc[cur_note] = "#" // so shift is never required
 						else
-							cur_oct[cur_note] = ni
-					playnote(uppertext(copytext(note,1,2)) + cur_acc[cur_note] + cur_oct[cur_note])
+							cur_oct[cur_note] = text2num(ni)
+					playnote(cur_note, cur_acc[cur_note], cur_oct[cur_note])
 				if(notes.len >= 2 && text2num(notes[2]))
-					sleep(song.tempo / text2num(notes[2]))
+					sleep(tempo / text2num(notes[2]))
 				else
-					sleep(song.tempo)
-		if(repeat > 0)
-			repeat-- //Infinite loops are baaaad.
-	while(repeat > 0)
+					sleep(tempo)
+		repeat--
+		if(repeat >= 0) // don't show the last -1 repeat
+			updateDialog(user)
 	playing = 0
-	updateUsrDialog()
+	repeat = 0
+	updateDialog(user)
 
-/obj/structure/device/piano/attack_hand(var/mob/user as mob)
-	if(!anchored)
-		return
+/datum/song/proc/interact(mob/user as mob)
+	var/dat = ""
 
-	usr.machine = src
-	var/dat = "<HEAD><TITLE>Piano</TITLE></HEAD><BODY>"
-
-	if(song)
-		if(song.lines.len > 0 && !(playing))
-			dat += "<A href='?src=\ref[src];play=1'>Play Song</A><BR><BR>"
-			dat += "<A href='?src=\ref[src];repeat=1'>Repeat Song: [repeat] times.</A><BR><BR>"
-		if(playing)
-			dat += "<A href='?src=\ref[src];stop=1'>Stop Playing</A><BR>"
-			dat += "Repeats left: [repeat].<BR><BR>"
+	if(lines.len > 0)
+		dat += "<H3>Playback</H3>"
+		if(!playing)
+			dat += "<A href='?src=\ref[src];play=1'>Play</A> <SPAN CLASS='linkOn'>Stop</SPAN><BR><BR>"
+			dat += "Repeat Song: "
+			dat += repeat > 0 ? "<A href='?src=\ref[src];repeat=-10'>-</A><A href='?src=\ref[src];repeat=-1'>-</A>" : "<SPAN CLASS='linkOff'>-</SPAN><SPAN CLASS='linkOff'>-</SPAN>"
+			dat += " [repeat] times "
+			dat += repeat < max_repeats ? "<A href='?src=\ref[src];repeat=1'>+</A><A href='?src=\ref[src];repeat=10'>+</A>" : "<SPAN CLASS='linkOff'>+</SPAN><SPAN CLASS='linkOff'>+</SPAN>"
+			dat += "<BR>"
+		else
+			dat += "<SPAN CLASS='linkOn'>Play</SPAN> <A href='?src=\ref[src];stop=1'>Stop</A><BR>"
+			dat += "Repeats left: <B>[repeat]</B><BR>"
 	if(!edit)
-		dat += "<A href='?src=\ref[src];edit=2'>Show Editor</A><BR><BR>"
+		dat += "<BR><B><A href='?src=\ref[src];edit=2'>Show Editor</A></B><BR>"
 	else
-		dat += "<A href='?src=\ref[src];edit=1'>Hide Editor</A><BR>"
-		dat += "<A href='?src=\ref[src];newsong=1'>Start a New Song</A><BR>"
-		dat += "<A href='?src=\ref[src];import=1'>Import a Song</A><BR><BR>"
-		if(song)
-			var/calctempo = (10/song.tempo)*60
-			dat += "Tempo : <A href='?src=\ref[src];tempo=10'>-</A><A href='?src=\ref[src];tempo=1'>-</A> [calctempo] BPM <A href='?src=\ref[src];tempo=-1'>+</A><A href='?src=\ref[src];tempo=-10'>+</A><BR><BR>"
-			var/linecount = 0
-			for(var/line in song.lines)
-				linecount += 1
-				dat += "Line [linecount]: [line] <A href='?src=\ref[src];deleteline=[linecount]'>Delete Line</A> <A href='?src=\ref[src];modifyline=[linecount]'>Modify Line</A><BR>"
-			dat += "<A href='?src=\ref[src];newline=1'>Add Line</A><BR><BR>"
+		dat += "<H3>Editing</H3>"
+		dat += "<B><A href='?src=\ref[src];edit=1'>Hide Editor</A></B>"
+		dat += " <A href='?src=\ref[src];newsong=1'>Start a New Song</A>"
+		dat += " <A href='?src=\ref[src];import=1'>Import a Song</A><BR><BR>"
+		var/calctempo = round(600 / tempo)
+		var/calcstep = tempo - 600 / (calctempo+1)
+		var/calcstep_b = tempo - 600 / (calctempo+10)
+		dat += "Tempo: <A href='?src=\ref[src];tempo=[calcstep_b]'>-</A><A href='?src=\ref[src];tempo=[calcstep]'>-</A> [calctempo] BPM <A href='?src=\ref[src];tempo=-[calcstep]'>+</A><A href='?src=\ref[src];tempo=-[calcstep_b]'>+</A><BR><BR>"
+		var/linecount = 0
+		for(var/line in lines)
+			linecount += 1
+			dat += "Line [linecount]: <A href='?src=\ref[src];modifyline=[linecount]'>Edit</A> <A href='?src=\ref[src];deleteline=[linecount]'>X</A> [line]<BR>"
+		dat += "<A href='?src=\ref[src];newline=1'>Add Line</A><BR><BR>"
 		if(help)
-			dat += "<A href='?src=\ref[src];help=1'>Hide Help</A><BR>"
+			dat += "<B><A href='?src=\ref[src];help=1'>Hide Help</A></B><BR>"
 			dat += {"
 					Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).<br>
 					Every note in a chord will play together, with chord timed by the tempo.<br>
@@ -292,140 +159,198 @@
 					A pause may be denoted by an empty chord: <i>C,E,,C,G</i><br>
 					To make a chord be a different time, end it with /x, where the chord length will be length<br>
 					defined by tempo / x: <i>C,G/2,E/4</i><br>
-					Combined, an example is: <i>E-E4/4,/2,G#/8,B/8,E3-E4/4</i>
+					Combined, an example is: <i>E-E4/4,F#/2,G#/8,B/8,E3-E4/4</i>
 					<br>
 					Lines may be up to 50 characters.<br>
 					A song may only contain up to 50 lines.<br>
 					"}
 		else
-			dat += "<A href='?src=\ref[src];help=2'>Show Help</A><BR>"
-	dat += "</BODY></HTML>"
-	user << browse(dat, "window=piano;size=700x300")
-	onclose(user, "piano")
+			dat += "<B><A href='?src=\ref[src];help=2'>Show Help</A></B><BR>"
 
-/obj/structure/device/piano/Topic(href, href_list)
+	var/datum/browser/popup = new(user, "instrument", instrumentObj.name, 700, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(instrumentObj.icon, instrumentObj.icon_state))
+	popup.open()
 
-	if(!in_range(src, usr) || issilicon(usr) || !anchored || !usr.canmove || usr.restrained())
-		usr << browse(null, "window=piano;size=700x300")
-		onclose(usr, "piano")
+
+/datum/song/Topic(href, href_list)
+	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained())
+		usr << browse(null, "window=instrument")
+		usr.unset_machine()
 		return
 
+	instrumentObj.add_fingerprint(usr)
+
 	if(href_list["newsong"])
-		song = new()
-	else if(song)
-		if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
-			if(playing) return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
-			var/tempnum = input("How many times do you want to repeat this piece? (max:10)") as num|null
-			if(tempnum > 10)
-				tempnum = 10
-			if(tempnum < 0)
-				tempnum = 0
-			repeat = round(tempnum)
+		lines = new()
+		tempo = 5 // default 120 BPM
+		name = ""
 
-		else if(href_list["tempo"])
-			song.tempo += round(text2num(href_list["tempo"]))
-			if(song.tempo < 1)
-				song.tempo = 1
-
-		else if(href_list["play"])
-			if(song)
-				playing = 1
-				spawn() playsong()
-
-		else if(href_list["newline"])
-			var/newline = html_encode(input("Enter your line: ", "Piano") as text|null)
-			if(!newline)
+	else if(href_list["import"])
+		var/t = ""
+		do
+			t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t)  as message)
+			if(!in_range(instrumentObj, usr))
 				return
-			if(song.lines.len > 50)
-				return
-			if(lentext(newline) > 50)
-				newline = copytext(newline, 1, 50)
-			song.lines.Add(newline)
 
-		else if(href_list["deleteline"])
-			var/num = round(text2num(href_list["deleteline"]))
-			if(num > song.lines.len || num < 1)
-				return
-			song.lines.Cut(num, num+1)
+			if(lentext(t) >= 3072)
+				var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
+				if(cont == "no")
+					break
+		while(lentext(t) > 3072)
 
-		else if(href_list["modifyline"])
-			var/num = round(text2num(href_list["modifyline"]),1)
-			var/content = html_encode(input("Enter your line: ", "Piano", song.lines[num]) as text|null)
-			if(!content)
-				return
-			if(lentext(content) > 50)
-				content = copytext(content, 1, 50)
-			if(num > song.lines.len || num < 1)
-				return
-			song.lines[num] = content
+		//split into lines
+		spawn()
+			lines = text2list(t, "\n")
+			if(copytext(lines[1],1,6) == "BPM: ")
+				tempo = 600 / max(1, text2num(copytext(lines[1],6)))
+				lines.Cut(1,2)
+			else
+				tempo = 5 // default 120 BPM
+			if(lines.len > 50)
+				usr << "Too many lines!"
+				lines.Cut(51)
+			var/linenum = 1
+			for(var/l in lines)
+				if(lentext(l) > 50)
+					usr << "Line [linenum] too long!"
+					lines.Remove(l)
+				else
+					linenum++
+			updateDialog(usr)		// make sure updates when complete
 
-		else if(href_list["stop"])
-			playing = 0
+	else if(href_list["help"])
+		help = text2num(href_list["help"]) - 1
 
-		else if(href_list["help"])
-			help = text2num(href_list["help"]) - 1
+	else if(href_list["edit"])
+		edit = text2num(href_list["edit"]) - 1
 
-		else if(href_list["edit"])
-			edit = text2num(href_list["edit"]) - 1
+	if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
+		if(playing)
+			return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
+		repeat += round(text2num(href_list["repeat"]))
+		if(repeat < 0)
+			repeat = 0
+		if(repeat > max_repeats)
+			repeat = max_repeats
 
-		else if(href_list["import"])
-			var/t = ""
-			do
-				t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", src.name), t)  as message)
-				if (!in_range(src, usr))
-					return
+	else if(href_list["tempo"])
+		tempo += text2num(href_list["tempo"])
+		if(tempo < 1)
+			tempo = 1
+		if(tempo > 600)
+			tempo = 600
 
-				if(lentext(t) >= 3072)
-					var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
-					if(cont == "no")
-						break
-			while(lentext(t) > 3072)
+	else if(href_list["play"])
+		playing = 1
+		spawn()
+			playsong(usr)
 
-			//split into lines
-			spawn()
-				var/list/lines = text2list(t, "\n")
-				var/tempo = 5
-				if(copytext(lines[1],1,6) == "BPM: ")
-					tempo = 600 / text2num(copytext(lines[1],6))
-					lines.Cut(1,2)
-				if(lines.len > 50)
-					usr << "Too many lines!"
-					lines.Cut(51)
-				var/linenum = 1
-				for(var/l in lines)
-					if(lentext(l) > 50)
-						usr << "Line [linenum] too long!"
-						lines.Remove(l)
-					else
-						linenum++
-				song = new()
-				song.lines = lines
-				song.tempo = tempo
-				updateUsrDialog()
+	else if(href_list["newline"])
+		var/newline = html_encode(input("Enter your line: ", instrumentObj.name) as text|null)
+		if(!newline || !in_range(instrumentObj, usr))
+			return
+		if(lines.len > 50)
+			return
+		if(lentext(newline) > 50)
+			newline = copytext(newline, 1, 50)
+		lines.Add(newline)
 
-	add_fingerprint(usr)
-	updateUsrDialog()
+	else if(href_list["deleteline"])
+		var/num = round(text2num(href_list["deleteline"]))
+		if(num > lines.len || num < 1)
+			return
+		lines.Cut(num, num+1)
+
+	else if(href_list["modifyline"])
+		var/num = round(text2num(href_list["modifyline"]),1)
+		var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
+		if(!content || !in_range(instrumentObj, usr))
+			return
+		if(lentext(content) > 50)
+			content = copytext(content, 1, 50)
+		if(num > lines.len || num < 1)
+			return
+		lines[num] = content
+
+	else if(href_list["stop"])
+		playing = 0
+
+	updateDialog(usr)
 	return
 
-/obj/structure/device/piano/attackby(obj/item/O as obj, mob/user as mob)
+
+// subclass for handheld instruments, like violin
+/datum/song/handheld
+
+/datum/song/handheld/updateDialog(mob/user as mob)
+	instrumentObj.interact(user)
+
+/datum/song/handheld/shouldStopPlaying()
+	if(instrumentObj)
+		return !isliving(instrumentObj.loc)
+	else
+		return 1
+
+
+//////////////////////////////////////////////////////////////////////////
+
+
+/obj/structure/piano
+	name = "space minimoog"
+	icon = 'icons/obj/musician.dmi'
+	icon_state = "minimoog"
+	anchored = 1
+	density = 1
+	var/datum/song/song
+
+
+/obj/structure/piano/New()
+	song = new("piano", src)
+
+	if(prob(50))
+		name = "space minimoog"
+		desc = "This is a minimoog, like a space piano, but more spacey!"
+		icon_state = "minimoog"
+	else
+		name = "space piano"
+		desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
+		icon_state = "piano"
+
+/obj/structure/piano/Destroy()
+	del(song)
+	song = null
+	..()
+
+/obj/structure/piano/attack_hand(mob/user as mob)
+	interact(user)
+
+/obj/structure/piano/interact(mob/user as mob)
+	if(!user || !anchored)
+		return
+
+	user.set_machine(src)
+	song.interact(user)
+
+/obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob)
 	if (istype(O, /obj/item/weapon/wrench))
-		if (anchored)
+		if (!anchored && !isinspace())
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-			user << "\blue You begin to loosen \the [src]'s casters..."
-			if (do_after(user, 40))
-				user.visible_message( \
-					"[user] loosens \the [src]'s casters.", \
-					"\blue You have loosened \the [src]. Now it can be pulled somewhere else.", \
-					"You hear ratchet.")
-				src.anchored = 0
-		else
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-			user << "\blue You begin to tighten \the [src] to the floor..."
+			user << "<span class='notice'> You begin to tighten \the [src] to the floor...</span>"
 			if (do_after(user, 20))
 				user.visible_message( \
 					"[user] tightens \the [src]'s casters.", \
-					"\blue You have tightened \the [src]'s casters. Now it can be played again.", \
+					"<span class='notice'> You have tightened \the [src]'s casters. Now it can be played again.</span>", \
 					"You hear ratchet.")
-				src.anchored = 1
+				anchored = 1
+		else if(anchored)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+			user << "<span class='notice'> You begin to loosen \the [src]'s casters...</span>"
+			if (do_after(user, 40))
+				user.visible_message( \
+					"[user] loosens \the [src]'s casters.", \
+					"<span class='notice'> You have loosened \the [src]. Now it can be pulled somewhere else.</span>", \
+					"You hear ratchet.")
+				anchored = 0
 	else
 		..()

maps/RandomZLevels/backup/clown3.dmm

@@ -154,7 +154,7 @@
 "cX" = (/obj/effect/landmark/corpse/mime,/turf/simulated/floor,/area/planet/clown)
 "cY" = (/obj/structure/rack,/obj/item/clothing/head/bowlerhat,/turf/simulated/floor,/area/planet/clown)
 "cZ" = (/obj/effect/landmark/corpse/clown,/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor/plating/snow,/area/planet/clown)
-"da" = (/obj/structure/table,/obj/item/weapon/crossbow/french,/turf/simulated/floor,/area/planet/clown)
+"da" = (/obj/structure/table,/obj/item/weapon/gun/launcher/crossbow/french,/turf/simulated/floor,/area/planet/clown)
 "db" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/planet/clown)
 "dc" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/baguette,/obj/item/weapon/reagent_containers/food/snacks/baguette,/obj/item/weapon/reagent_containers/food/snacks/baguette,/turf/simulated/floor,/area/planet/clown)
 "dd" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/simulated/floor,/area/planet/clown)

maps/RandomZLevels/clown3.dmm

@@ -190,7 +190,7 @@
 "dH" = (/turf/simulated/floor/wood{tag = "icon-wood-broken3"; icon_state = "wood-broken3"},/area/planet/clown)
 "dI" = (/obj/effect/landmark/corpse/mime,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/wood,/area/planet/clown)
 "dJ" = (/obj/effect/landmark/corpse/clown,/turf/simulated/floor,/area/planet/clown)
-"dK" = (/obj/structure/device/piano,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
+"dK" = (/obj/structure/piano,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "dL" = (/obj/structure/stool/bed/chair/wood/normal{tag = "icon-wooden_chair (WEST)"; icon_state = "wooden_chair"; dir = 8},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "dM" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/bananapeel,/obj/effect/landmark/corpse/mime,/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor/plating/snow,/area/planet/clown)
 "dN" = (/obj/effect/decal/snow/clean/edge{tag = "icon-snow_corner (EAST)"; icon_state = "snow_corner"; dir = 4},/obj/effect/landmark/corpse/mime,/turf/unsimulated/floor/plating/snow/concrete,/area/planet/clown)
@@ -245,7 +245,7 @@
 "eK" = (/obj/item/device/violin,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "eL" = (/obj/effect/decal/snow/clean/edge,/turf/simulated/floor{icon_state = "solarpanel"},/area/planet/clown)
 "eM" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/wood,/area/planet/clown)
-"eN" = (/obj/structure/device/piano{icon_state = "piano"; name = "space piano"},/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
+"eN" = (/obj/structure/piano{icon_state = "piano"; name = "space piano"},/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "eO" = (/obj/structure/stool/bed/chair/wood/normal{tag = "icon-wooden_chair (WEST)"; icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "eP" = (/obj/item/flag/mime,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown)
 "eQ" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/planet/clown)

maps/cyberiad.dmm

@@ -2619,7 +2619,7 @@
 "aYs" = (/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/hallway/primary/central/ne)
 "aYt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/central/ne)
 "aYu" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area)
-"aYv" = (/obj/structure/device/piano,/turf/simulated/floor/wood,/area/crew_quarters/bar)
+"aYv" = (/obj/structure/piano,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aYw" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aYx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aYy" = (/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/kitchen)
@@ -8301,7 +8301,7 @@
 "ddG" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/living)
 "ddH" = (/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/structure/table,/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
 "ddI" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
-"ddJ" = (/obj/structure/device/piano{dir = 4},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
+"ddJ" = (/obj/structure/piano{dir = 4},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
 "ddK" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
 "ddL" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living)
 "ddM" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)