From 66370528993e8749bee52b5702424d0aec43143b Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Tue, 4 Jul 2017 17:51:09 -0300
Subject: [PATCH] Fixes #2939 (#2944)

Fixes #2939 by removing the simple animal mind datum that replaced the assigned_role with animal instead of keeping as it is.
Also, adds apprentices to the wizard antag list, allowing them to use aooc and etc.
---
 code/datums/mind.dm              | 16 ++++++++--------
 code/modules/spells/contracts.dm |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 2c5da4cc175..4bcc0c2addc 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -524,14 +524,6 @@
 	mind.special_role = ""
 
 //Animals
-/mob/living/simple_animal/mind_initialize()
-	..()
-	mind.assigned_role = "Animal"
-
-/mob/living/simple_animal/corgi/mind_initialize()
-	..()
-	mind.assigned_role = "Corgi"
-
 /mob/living/simple_animal/shade/mind_initialize()
 	..()
 	mind.assigned_role = "Shade"
@@ -564,3 +556,11 @@
 /mob/living/simple_animal/hostile/faithless/wizard/mind_initialize()
 	..()
 	mind.assigned_role = "Space Wizard"
+
+/mob/living/simple_animal/familiar/mind_initialize()
+	..()
+	mind.assigned_role = "Familiar"
+
+/mob/living/simple_animal/mouse/familiar/familiar/mind_initialize()
+	..()
+	mind.assigned_role = "Familiar"
diff --git a/code/modules/spells/contracts.dm b/code/modules/spells/contracts.dm
index 1ec00d383f1..183d7bb97ca 100644
--- a/code/modules/spells/contracts.dm
+++ b/code/modules/spells/contracts.dm
@@ -50,6 +50,7 @@
 		user.mind.assigned_role = "Apprentice"
 		user << "<span class='notice'>With the signing of this paper you agree to become \the [contract_master]'s apprentice in the art of wizardry.</span>"
 		user.faction = "Space Wizard"
+		wizards.add_antagonist_mind(user.mind,1)
 		new /obj/item/weapon/spellbook/student(get_turf(user))
 		return 1
 	return 0