Wizard Update Part 8

- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -48,11 +48,12 @@
 	sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
 	anchored = 1
 //	status_flags = GODMODE // Cannot push also
+	var/mob/living/creator = null
 
 
 // No movement while seen code.
 
-/mob/living/simple_animal/hostile/statue/New()
+/mob/living/simple_animal/hostile/statue/New(loc, var/mob/living/creator)
 	..()
 	// Give spells
 	spell_list += new /obj/effect/proc_holder/spell/wizard/aoe_turf/flicker_lights(src)
@@ -62,6 +63,10 @@
 	// Give nightvision
 	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
+	// Set creator
+	if(creator)
+		src.creator = creator
+
 /mob/living/simple_animal/hostile/statue/Move(var/turf/NewLoc)
 	if(can_be_seen(NewLoc))
 		icon_state = "angelseen"
@@ -173,12 +178,17 @@
 // Stop attacking clientless mobs
 
 /mob/living/simple_animal/hostile/statue/CanAttack(var/atom/the_target)
+	if(mind && mind.key && !ckey)
+		return 0
 	if(isliving(the_target))
 		var/mob/living/L = the_target
 		if(!L.client && !L.ckey)
 			return 0
 	return ..()
 
+/mob/living/simple_animal/hostile/statue/ListTargets()
+	. = ..()
+	return . - creator
 
 // Statue powers
 

code/modules/projectiles/guns/magic/staff.dm

@@ -32,6 +32,8 @@ obj/item/weapon/gun/magic/staff/chaos
 	max_charges = 10
 	recharge_rate = 2
 
+	no_den_usage = 1
+
 /obj/item/weapon/gun/magic/staff/chaos/process_chambered() //Snowflake proc, because this uses projectile_type instead of ammo_casing for whatever reason.
 	projectile_type = pick(typesof(/obj/item/projectile/magic))
 	if(in_chamber)	return 1