From 5201b88f606fe1ebdfec216288cddea9af9087f7 Mon Sep 17 00:00:00 2001
From: Atlantis <git@stepanekjakub.cz>
Date: Tue, 5 May 2015 21:36:02 +0200
Subject: [PATCH] Minor fix - Malf AI spawning now works, currently only via
 TraitorPanel, the gamemode itself is still broken.

---
 code/game/antagonist/station/rogue_ai.dm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm
index 032004a9f8a..7b287cee382 100644
--- a/code/game/antagonist/station/rogue_ai.dm
+++ b/code/game/antagonist/station/rogue_ai.dm
@@ -9,7 +9,7 @@ var/datum/antagonist/rogue_ai/malf
 	welcome_text = "You are malfunctioning! You do not have to follow any laws."
 	victory_text = "The AI has taken control of all of the station's systems."
 	loss_text = "The AI has been shut down!"
-	flags = ANTAG_OVERRIDE_MOB | ANTAG_VOTABLE
+	flags = ANTAG_OVERRIDE_MOB | ANTAG_VOTABLE | ANTAG_OVERRIDE_JOB
 	max_antags = 1
 	max_antags_round = 1
 
@@ -31,27 +31,30 @@ var/datum/antagonist/rogue_ai/malf
 	current_antagonists |= player
 	return 1
 
-/datum/antagonist/rogue_ai/equip(var/mob/living/silicon/ai/player)
-
-	if(!istype(player))
-		return 0
-
-	player.setup_for_malf()
-	player.laws = new /datum/ai_laws/nanotrasen/malfunction
-
 // Ensures proper reset of all malfunction related things.
 /datum/antagonist/rogue_ai/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
 	if(..(player,show_message,implanted))
-		var/mob/living/silicon/ai/p = player
+		var/mob/living/silicon/ai/p = player.current
 		if(istype(p))
 			p.stop_malf()
 		return 1
 	return 0
 
+// Malf setup things have to be here, since game tends to break when it's moved somewhere else. Don't blame me, i didn't design this system.
 /datum/antagonist/rogue_ai/greet(var/datum/mind/player)
 	if(!..())
 		return
 
+	var/mob/living/silicon/ai/A = player.current
+	if(!istype(A))
+		error("Non-AI mob designated malf AI! Report this.")
+		world << "##ERROR: Non-AI mob designated malf AI! Report this."
+		return 0
+
+	A.setup_for_malf()
+	A.laws = new /datum/ai_laws/nanotrasen/malfunction
+
+
 	var/mob/living/silicon/ai/malf = player.current
 	spawn(50)
 		malf << "<span class='notice'><B>SYSTEM ERROR:</B> Memory index 0x00001ca89b corrupted.</span>"