From 4577df235e8a74f289db21edaaa9a7b07fdd7489 Mon Sep 17 00:00:00 2001
From: "kortgstation@gmail.com"
 <kortgstation@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 26 Apr 2012 02:51:49 +0000
Subject: [PATCH] Fixes some runtimes my last commit caused. Sets construct
 real_names so they don't mess up the show antagonist list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3511 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/gamemodes/cult/cult.dm             | 2 +-
 code/game/gamemodes/wizard/soulstone.dm      | 6 +++---
 code/modules/mob/simple_animal/constructs.dm | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 2c02854b299..37bdd8d9cff 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -4,7 +4,7 @@
 		list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide")
 
 
-/proc/iscultist(mob/living/carbon/M as mob)
+/proc/iscultist(mob/living/M as mob)
 	return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.cult)
 
 /proc/is_convertable_to_cult(datum/mind/mind)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 37bea03573e..a3d7cdf9c27 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -166,7 +166,7 @@
 						var/mob/living/simple_animal/constructarmoured/Z = new /mob/living/simple_animal/constructarmoured (get_turf(T.loc))
 						if (A.client)
 							A.client.mob = Z
-							Z.mind_initialize(src)
+							Z.mind_initialize(Z)
 							if(iscultist(U))
 								if (ticker.mode.name == "cult")
 									ticker.mode:add_cultist(Z.mind)
@@ -183,7 +183,7 @@
 						var/mob/living/simple_animal/constructwraith/Z = new /mob/living/simple_animal/constructwraith (get_turf(T.loc))
 						if (A.client)
 							A.client.mob = Z
-							Z.mind_initialize(src)
+							Z.mind_initialize(Z)
 							if(iscultist(U))
 								if (ticker.mode.name == "cult")
 									ticker.mode:add_cultist(Z.mind)
@@ -200,7 +200,7 @@
 						var/mob/living/simple_animal/constructbuilder/Z = new /mob/living/simple_animal/constructbuilder (get_turf(T.loc))
 						if (A.client)
 							A.client.mob = Z
-							Z.mind_initialize(src)
+							Z.mind_initialize(Z)
 							if(iscultist(U))
 								if (ticker.mode.name == "cult")
 									ticker.mode:add_cultist(Z.mind)
diff --git a/code/modules/mob/simple_animal/constructs.dm b/code/modules/mob/simple_animal/constructs.dm
index fcc89d3f40d..bf7e50f8f8e 100644
--- a/code/modules/mob/simple_animal/constructs.dm
+++ b/code/modules/mob/simple_animal/constructs.dm
@@ -3,6 +3,7 @@
 
 /mob/living/simple_animal/constructarmoured
 	name = "Juggernaut"
+	real_name = "Juggernaut"
 	desc = "A possessed suit of armour driven by the will of the restless dead"
 	icon = 'mob.dmi'
 	icon_state = "armour"
@@ -141,6 +142,7 @@
 
 /mob/living/simple_animal/constructwraith
 	name = "Wraith"
+	real_name = "Wraith"
 	desc = "A wicked bladed shell contraption piloted by a bound spirit"
 	icon = 'mob.dmi'
 	icon_state = "floating"
@@ -269,6 +271,7 @@
 
 /mob/living/simple_animal/constructbuilder
 	name = "Artificer"
+	real_name = "Artificer"
 	desc = "A bulbous construct dedicated to building and maintaining The Cult of Nar-Sie's armies"
 	icon = 'mob.dmi'
 	icon_state = "artificer"