Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor

Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm

code/game/objects/structures/musician.dm

@@ -84,10 +84,10 @@
 
 		for(var/line in 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 || shouldStopPlaying(user))//If the instrument is playing, or special case
 						playing = 0
@@ -204,7 +204,7 @@
 
 		//split into lines
 		spawn()
-			lines = text2list(t, "\n")
+			lines = splittext(t, "\n")
 			if(copytext(lines[1],1,6) == "BPM: ")
 				tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
 				lines.Cut(1,2)

code/game/objects/structures/tables_racks.dm

@@ -44,16 +44,28 @@
 		smooth_icon_neighbors(src)
 
 /obj/structure/table/ex_act(severity, target)
-	..()
-	if(severity == 3)
-		if(prob(25))
-			table_destroy(1)
+	switch(severity)
+		if(1)
+			qdel(src)
+		if(2)
+			if(prob(50))
+				table_destroy(1)
+			else
+				qdel(src)
+		if(3)
+			if(prob(25))
+				table_destroy(1)
 
 /obj/structure/table/blob_act()
 	if(prob(75))
 		table_destroy(1)
 		return
 
+/obj/structure/table/mech_melee_attack(obj/mecha/M)
+	visible_message("<span class='danger'>[M.name] smashes [src] apart!</span>")
+	playsound(src.loc, 'sound/weapons/punch4.ogg', 50, 1)
+	table_destroy(1)
+
 /obj/structure/table/attack_alien(mob/living/user)
 	user.do_attack_animation(src)
 	playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1)
@@ -447,6 +459,10 @@
 		rack_destroy()
 		return
 
+/obj/structure/rack/mech_melee_attack(obj/mecha/M)
+	visible_message("<span class='danger'>[M.name] smashes [src] apart!</span>")
+	rack_destroy(1)
+
 /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
 	if(height==0) return 1
 	if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|

code/game/objects/structures/tank_dispenser.dm

@@ -68,7 +68,7 @@
 		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 100, master_ui, state)
 		ui.open()
 
-/obj/structure/tank_dispenser/get_ui_data(mob/user)
+/obj/structure/tank_dispenser/ui_data(mob/user)
 	var/list/data = list()
 	data["oxygen"] = oxygentanks
 	data["plasma"] = plasmatanks

code/game/objects/structures/transit_tubes/transit_tube.dm

@@ -262,7 +262,7 @@ obj/structure/transit_tube/ex_act(severity, target)
 	if(text in direction_table)
 		return direction_table[text]
 
-	var/list/split_text = text2list(text, "-")
+	var/list/split_text = splittext(text, "-")
 
 	// If the first token is D, the icon_state represents
 	//  a purely decorative tube, and doesn't actually

code/game/objects/structures/transit_tubes/transit_tube_construction.dm

@@ -16,19 +16,19 @@
 //wrapper for turn that changes the transit tube formatted icon_state instead of the dir
 /obj/structure/c_transit_tube/proc/tube_turn(angle)
 	var/list/badtubes = list("W-E", "W-E-Pass", "S-N", "S-N-Pass", "SW-NE", "SE-NW")
-	var/list/split_text = text2list(icon_state, "-")
+	var/list/split_text = splittext(icon_state, "-")
 	for(var/i=1; i<=split_text.len; i++)
 		var/curdir = text2dir_extended(split_text[i]) //0 if not a valid direction (e.g. Pass, Block)
 		if(curdir)
 			split_text[i] = dir2text_short(turn(curdir, angle))
-	var/newdir = list2text(split_text, "-")
+	var/newdir = jointext(split_text, "-")
 	if(badtubes.Find(newdir))
 		split_text.Swap(1,2)
-		newdir = list2text(split_text, "-")
+		newdir = jointext(split_text, "-")
 	icon_state = newdir
 
 /obj/structure/c_transit_tube/proc/tube_flip()
-	var/list/split_text = text2list(icon_state, "-")
+	var/list/split_text = splittext(icon_state, "-")
 	//skip straight pipes
 	if(length(split_text[2]) < 2)
 		return
@@ -44,7 +44,7 @@
 			split_text[2] = copytext(split_text[2],1,2) + ((copytext(split_text[2],2,3) == "E") ? "W" : "E")
 		else
 			split_text[2] = ((copytext(split_text[2],1,2) == "N") ? "S" : "N") + copytext(split_text[2],2,3)
-	icon_state = list2text(split_text, "-")
+	icon_state = jointext(split_text, "-")
 
 // disposals-style flip and rotate verbs
 /obj/structure/c_transit_tube/verb/rotate()