MT/TS: Added to map, fluffy cleanup, icon fix

This commit adds an MT/TS to the research department, changes the names
and descriptions of the tram parts to have a little more care, and
slightly fixes the rail icon.

code/modules/tram/tram.dm

@@ -31,10 +31,6 @@
 		qdel(src)
 	..()
 
-/obj/tram/emp_act(severity)
-	if(automode)	automode = 0
-	..()
-
 /obj/tram/tram_controller
 	name = ""
 	desc = "tram controller"
@@ -73,6 +69,10 @@
 		remove_controller(CP)
 	..()
 
+/obj/tram/tram_controller/emp_act(severity)
+	if(automode)	automode = 0
+	..()
+
 /obj/tram/tram_controller/process()
 	update_tram() //Update combine to account for new mobs and/or objects
 	if(automode)
@@ -92,6 +92,7 @@
 		stored_rail = RT
 	for(var/cdir in cardinal)
 		for(var/obj/tram/rail/R in get_step(src,cdir))
+			if(!istype(R))	continue
 			if(R != last_played_rail)
 				handle_move(get_dir(src,R))
 				last_played_rail = stored_rail
@@ -135,14 +136,17 @@
 			if(AM in tram)	continue
 			if(!check_validity(AM))	continue
 			tram += AM
+			if(!(src in tram))
+				tram += src
 
 /obj/tram/tram_controller/proc/check_validity(var/atom/movable/AM)
 	if(!AM)	return 0
 	if(is_type_in_list(AM, blacklist))	return 0
 	if(!AM.simulated)	return 0
 	if(AM.anchored)
-		if(!istype(AM,/obj/tram) || !istype(AM,/obj/vehicle))
-			return 0
+		if(istype(AM,/obj/tram) || istype(AM,/obj/vehicle))
+			return 1
+		return 0
 	return 1
 
 /obj/tram/tram_controller/proc/init_controllers()

code/modules/tram/tram_control_pad.dm

@@ -1,6 +1,6 @@
 /obj/tram/controlpad
 	name = "tram controller interface"
-	desc = "Controls the tram."
+	desc = "Controls a tram."
 	icon = 'icons/obj/airlock_machines.dmi'
 	icon_state = "airlock_control_standby"
 	var/obj/tram/tram_controller/tram_linked

code/modules/tram/tram_floor.dm

@@ -1,5 +1,6 @@
 /obj/tram/floor
-	name = "floor"
+	name = "tram platform"
+	desc = "A holding space for a tram system."
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "floor"
 	var/obj/tram/tram_controller/controller

code/modules/tram/tram_rail.dm

@@ -3,4 +3,5 @@
 	desc = "A guiding rail for trams"
 	icon = 'icons/obj/tram/tram_rail.dmi'
 	icon_state = "rail"
-	var/godir = null
+	var/godir = null
+	layer = TURF_LAYER + 0.1

code/modules/tram/tram_wall.dm

@@ -1,6 +1,6 @@
 /obj/tram/wall
-	name = "reinforced wall"
-	desc = "A huge chunk of reinforced metal used to seperate rooms."
+	name = "reinforced tram wall"
+	desc = "A huge chunk of reinforced metal used to shield a tram system."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "r_wall"
 	var/obj/tram/tram_controller/controller