From 6a129739b3aab7da880daf1c912c835cb12e7b08 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Mon, 10 Aug 2015 20:00:53 +0200
Subject: [PATCH] Fix traitor end of round message

---
 code/game/gamemodes/gameticker.dm          | 5 +++++
 code/game/gamemodes/heist/heist.dm         | 3 +--
 code/game/gamemodes/scoreboard.dm          | 5 -----
 code/game/objects/items/devices/uplinks.dm | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 05ce9b91f2f..56798e7ca3d 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -504,6 +504,11 @@ var/global/datum/controller/gameticker/ticker
 		world << "<b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round."
 
 	mode.declare_completion()//To declare normal completion.
+	
+	//calls auto_declare_completion_* for all modes
+	for(var/handler in typesof(/datum/game_mode/proc))
+		if (findtext("[handler]","auto_declare_completion_"))
+			call(mode, handler)()
 
 	mode.declare_job_completion()
 
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index df06d9abb3f..5a0de42265f 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -248,7 +248,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 
 	..()
 
-datum/game_mode/declare_completion()
+datum/game_mode/proc/auto_declare_completion_heist()
 	if(raiders.len)
 		var/check_return = 0
 		if(ticker && istype(ticker.mode,/datum/game_mode/heist))
@@ -275,7 +275,6 @@ datum/game_mode/declare_completion()
 
 		world << text
 		
-	..()	
 	return 1
 
 /datum/game_mode/heist/check_finished()
diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm
index 04d4021f9d2..73fbc4d972d 100644
--- a/code/game/gamemodes/scoreboard.dm
+++ b/code/game/gamemodes/scoreboard.dm
@@ -1,10 +1,5 @@
 /datum/controller/gameticker/proc/scoreboard()
 
-	//calls auto_declare_completion_* for all modes
-	for(var/handler in typesof(/datum/game_mode/proc))
-		if (findtext("[handler]","auto_declare_completion_"))
-			call(mode, handler)()
-
 	//Print a list of antagonists to the server log
 	var/list/total_antagonists = list()
 	//Look into all mobs in world, dead or alive
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 22cebb08654..4efc8bdc2ee 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -17,7 +17,7 @@ var/list/world_uplinks = list()
 	var/nanoui_menu = 0		// The current menu we are in
 	var/list/nanoui_data = new // Additional data for NanoUI use
 
-	var/list/purchase_log = new
+	var/purchase_log = ""
 	var/uplink_owner = null//text-only
 	var/used_TC = 0