additional mergefixes, including tg map updates

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/living/carbon/human/human.dm

@@ -670,3 +670,13 @@
 			return "Skrell"
 		else if(src.dna.mutantrace == "tajaran")
 			return "Tajaran"
+
+/mob/living/carbon/human/proc/play_xylophone()
+	if(!src.xylophone)
+		visible_message("\red [src] begins playing his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.")
+		var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
+		playsound(loc, song, 50, 1, -1)
+		xylophone = 1
+		spawn(1200)
+			xylophone=0
+	return

code/modules/mob/new_player/new_player.dm

@@ -188,7 +188,7 @@
 
 		if(href_list["late_join"])
 			if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
-				usr << "/red The round is either not ready, or has already finished..."
+				usr << "\red The round is either not ready, or has already finished..."
 				return
 
 			if(preferences.species != "Human")
@@ -302,13 +302,16 @@
 				src.poll_player(pollid)
 			return
 
-		if(href_list["votepollid"] && href_list["voteoptionid"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
-
+		if(href_list["votepollid"] && href_list["votetype"])
 			var/pollid = text2num(href_list["votepollid"])
-			var/optionid = text2num(href_list["voteoptionid"])
-			vote_on_poll(pollid, optionid)
+			var/votetype = href_list["votetype"]
+			switch(votetype)
+				if("OPTION")
+					var/optionid = text2num(href_list["voteoptionid"])
+					vote_on_poll(pollid, optionid)
+				if("TEXT")
+					var/replytext = href_list["replytext"]
+					log_text_poll_reply(pollid, replytext)
 
 	proc/IsJobAvailable(rank)
 		var/datum/job/job = job_master.GetJob(rank)