Conflict fix.

code/modules/projectiles/guns/energy/special.dm

@@ -63,6 +63,15 @@ obj/item/weapon/gun/energy/staff
 
 	update_icon()
 		return
+
+
+	click_empty(mob/user = null)
+		if (user)
+			user.visible_message("*fizzle*", "\red <b>*fizzle*</b>")
+		else
+			src.visible_message("*fizzle*")
+		playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1)
+
 /obj/item/weapon/gun/energy/staff/animate
 	name = "staff of animation"
 	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."

code/modules/projectiles/projectile.dm

@@ -112,27 +112,25 @@
 					M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
 					msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
 
-		spawn(0)
-
-			if(A)
-				if (!forcedodge)
-					forcedodge = A.bullet_act(src, def_zone) // searches for return value
-				if(forcedodge == -1) // the bullet passes through a dense object!
-					bumped = 0 // reset bumped variable!
-					if(istype(A, /turf))
-						loc = A
-					else
-						loc = A.loc
-					permutated.Add(A)
-					return 0
-				if(istype(A,/turf))
-					for(var/obj/O in A)
-						O.bullet_act(src)
-					for(var/mob/M in A)
-						M.bullet_act(src, def_zone)
-				density = 0
-				invisibility = 101
-				del(src)
+		if(A)
+			if (!forcedodge)
+				forcedodge = A.bullet_act(src, def_zone) // searches for return value
+			if(forcedodge == -1) // the bullet passes through a dense object!
+				bumped = 0 // reset bumped variable!
+				if(istype(A, /turf))
+					loc = A
+				else
+					loc = A.loc
+				permutated.Add(A)
+				return 0
+			if(istype(A,/turf))
+				for(var/obj/O in A)
+					O.bullet_act(src)
+				for(var/mob/M in A)
+					M.bullet_act(src, def_zone)
+			density = 0
+			invisibility = 101
+			del(src)
 		return 1
 
 

code/modules/projectiles/projectile/animate.dm

@@ -7,7 +7,7 @@
 	flag = "energy"
 
 /obj/item/projectile/animate/Bump(var/atom/change)
-	. = ..()
-	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
+	if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))
 		var/obj/O = change
 		new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
+	..()