Merge pull request #1184 from Yoshax/510prep

Ports Byond 510 preperations from Bay

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

@@ -202,10 +202,10 @@
 
 		for(var/line in song.lines)
 			//world << line
-			for(var/beat in text2list(lowertext(line), ","))
+			for(var/beat in splittext(lowertext(line), ","))
 				//world << "beat: [beat]"
-				var/list/notes = text2list(beat, "/")
-				for(var/note in text2list(notes[1], "-"))
+				var/list/notes = splittext(beat, "/")
+				for(var/note in splittext(notes[1], "-"))
 					//world << "note: [note]"
 					if(!playing || !isliving(loc))//If the violin is playing, or isn't held by a person
 						playing = 0
@@ -367,7 +367,7 @@
 
 			//split into lines
 			spawn()
-				var/list/lines = text2list(t, "\n")
+				var/list/lines = splittext(t, "\n")
 				var/tempo = 5
 				if(copytext(lines[1],1,6) == "BPM: ")
 					tempo = 600 / text2num(copytext(lines[1],6))

code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm

@@ -9,7 +9,7 @@
 	var/list/network
 	var/locked = 1
 	var/emagged = 0
-	
+
 /obj/item/weapon/circuitboard/security/New()
 	..()
 	network = station_networks
@@ -18,7 +18,7 @@
 	name = T_BOARD("engineering camera monitor")
 	build_path = /obj/machinery/computer/security/engineering
 	req_access = list()
-	
+
 /obj/item/weapon/circuitboard/security/engineering/New()
 	..()
 	network = engineering_networks
@@ -36,7 +36,7 @@
 /obj/item/weapon/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C)
 	if (..(C))
 		network = C.network
-	
+
 /obj/item/weapon/circuitboard/security/emag_act(var/remaining_charges, var/mob/user)
 	if(emagged)
 		user << "Circuit lock is already removed."
@@ -60,12 +60,12 @@
 		if(locked)
 			user << "<span class='warning'>Circuit controls are locked.</span>"
 			return
-		var/existing_networks = list2text(network,",")
+		var/existing_networks = jointext(network,",")
 		var/input = sanitize(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks))
 		if(!input)
 			usr << "No input found please hang up and try your call again."
 			return
-		var/list/tempnetwork = text2list(input, ",")
+		var/list/tempnetwork = splittext(input, ",")
 		tempnetwork = difflist(tempnetwork,restricted_camera_networks,1)
 		if(tempnetwork.len < 1)
 			usr << "No network found please hang up and try your call again."