BS12 -> Ponies merge

code/controllers/master_controller.dm

@@ -24,6 +24,7 @@ datum/controller/game_controller
 	var/objects_cost	= 0
 	var/networks_cost	= 0
 	var/powernets_cost	= 0
+	var/nano_cost		= 0
 	var/events_cost		= 0
 	var/ticker_cost		= 0
 	var/total_cost		= 0
@@ -191,6 +192,13 @@ datum/controller/game_controller/proc/process()
 
 				sleep(breather_ticks)
 
+				//NANO UIS
+				timer = world.timeofday
+				process_nano()
+				nano_cost = (world.timeofday - timer) / 10
+				
+				sleep(breather_ticks)
+
 				//EVENTS
 				timer = world.timeofday
 				process_events()
@@ -203,7 +211,7 @@ datum/controller/game_controller/proc/process()
 				ticker_cost = (world.timeofday - timer) / 10
 
 				//TIMING
-				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + events_cost + ticker_cost
+				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + nano_cost + events_cost + ticker_cost
 
 				var/end_time = world.timeofday
 				if(end_time < start_time)
@@ -281,6 +289,16 @@ datum/controller/game_controller/proc/process_powernets()
 			continue
 		powernets.Cut(i,i+1)
 
+datum/controller/game_controller/proc/process_nano()
+	var/i = 1
+	while(i<=nanomanager.processing_uis.len)
+		var/datum/nanoui/ui = nanomanager.processing_uis[i]
+		if(ui && ui.src_object && ui.user)
+			ui.process()
+			i++
+			continue
+		nanomanager.processing_uis.Cut(i,i+1)
+
 datum/controller/game_controller/proc/process_events()
 	last_thing_processed = /datum/event
 	var/i = 1

code/controllers/voting.dm

@@ -117,7 +117,8 @@ datum/controller/vote
 		var/text
 		if(winners.len > 0)
 			if(winners.len > 1)
-				text = "<b>Vote Tied Between:</b>\n"
+				if(mode != "gamemode" || ticker.hide_mode == 0) // Here we are making sure we don't announce potential game modes
+					text = "<b>Vote Tied Between:</b>\n"
 				for(var/option in winners)
 					text += "\t[option]\n"
 			. = pick(winners)
@@ -125,8 +126,14 @@ datum/controller/vote
 			for(var/key in current_votes)
 				if(choices[current_votes[key]] == .)
 					round_voters += key // Keep track of who voted for the winning round.
+			if((mode == "gamemode" && . == "extended") || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
+				text += "<b>Vote Result: [.]</b>"
+			else
+				if(mode != "gamemode")
+					text += "<b>Vote Result: [.]</b>"
+				else
+					text += "<b>The vote has ended.</b>" // What will be shown if it is a gamemode vote that isn't extended
 
-			text += "<b>Vote Result: [.]</b>"
 		else
 			text += "<b>Vote Result: Inconclusive - No Votes!</b>"
 		log_vote(text)