Merges AI Branch into Master

code/modules/spells/aoe_turf/summons.dm

@@ -20,7 +20,7 @@
 	invocation_type = SpI_SHOUT
 	range = 1
 
-	summon_type = list(/mob/living/simple_animal/hostile/carp)
+	summon_type = list(/mob/living/simple_mob/animal/space/carp)
 
 	hud_state = "wiz_carp"
 
@@ -36,6 +36,10 @@
 	summon_amt = 10
 	range = 3
 
+<<<<<<< HEAD
 	summon_type = list(/mob/living/simple_animal/hostile/creature/vore) // Vorestation Edit
+=======
+	summon_type = list(/mob/living/simple_mob/creature)
+>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
 
 	hud_state = "wiz_creature"

code/modules/spells/spell_code.dm

@@ -198,10 +198,10 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
 			if(findNullRod(T))
 				return 0
 
-	if(istype(user, /mob/living/simple_animal) && holder == user)
-		var/mob/living/simple_animal/SA = user
-		if(SA.purge)
-			SA << "<span class='warning'>The nullrod's power interferes with your own!</span>"
+	if(istype(user, /mob/living/simple_mob) && holder == user)
+		var/mob/living/simple_mob/SM = user
+		if(SM.purge)
+			SM << "<span class='warning'>The nullrod's power interferes with your own!</span>"
 			return 0
 
 	if(!src.check_charge(skipcharge, user)) //sees if we can cast based on charges alone

code/modules/spells/spellbook.dm

@@ -221,11 +221,6 @@
 							new /obj/item/clothing/head/helmet/space/void/wizard(get_turf(H))
 							temp = "You have purchased a suit of wizard armor."
 							max_uses--
-						if("staffanimation")
-							feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
-							new /obj/item/weapon/gun/energy/staff/animate(get_turf(H))
-							temp = "You have purchased a staff of animation."
-							max_uses--
 						if("scrying")
 							feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
 							new /obj/item/weapon/scrying(get_turf(H))