Merge branch 'master' into upstream-merge-26386

code/modules/spells/spell_types/area_teleport.dm

@@ -47,7 +47,7 @@
 					L+=T
 
 		if(!L.len)
-			usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
+			to_chat(usr, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")
 			return
 
 		if(target && target.buckled)

code/modules/spells/spell_types/charge.dm

@@ -26,9 +26,9 @@
 				if(M.mind)
 					for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list)
 						S.charge_counter = S.charge_max
-				M <<"<span class='notice'>You feel raw magic flowing through you. It feels good!</span>"
+				to_chat(M, "<span class='notice'>You feel raw magic flowing through you. It feels good!</span>")
 			else
-				M <<"<span class='notice'>you feel very strange for a moment, but then it passes.</span>"
+				to_chat(M, "<span class='notice'>You feel very strange for a moment, but then it passes.</span>")
 				burnt_out = 1
 			charged_item = M
 			break

code/modules/spells/spell_types/conjure.dm

@@ -42,6 +42,11 @@
 			if(summon_lifespan)
 				QDEL_IN(summoned_object, summon_lifespan)
 
+			post_summon(summoned_object, user)
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/proc/post_summon(atom/summoned_object, mob/user)
+	return
+
 /obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes - Also a lot of fun
 	name = "Dispense Wizard Justice"
 	desc = "This spell dispenses wizard justice."

code/modules/spells/spell_types/devil.dm

@@ -234,7 +234,7 @@
 	else
 		var/list/funky_turfs = RANGE_TURFS(1, user)
 		for(var/turf/closed/solid in funky_turfs)
-			user << "<span class='warning'>You're too close to a wall.</span>"
+			to_chat(user, "<span class='warning'>You're too close to a wall.</span>")
 			return
 		dancefloor_exists = TRUE
 		var/i = 1

code/modules/spells/spell_types/the_traps.dm

@@ -3,7 +3,7 @@
 	desc = "Summon a number of traps to confuse and weaken your enemies, and possibly you."
 
 	charge_max = 250
-	cooldown_min = 100
+	cooldown_min = 50
 
 	clothes_req = 1
 	invocation = "CAVERE INSIDIAS"
@@ -14,10 +14,13 @@
 		/obj/structure/trap/stun,
 		/obj/structure/trap/fire,
 		/obj/structure/trap/chill,
-		/obj/structure/trap/damage,
-		/obj/structure/swarmer/trap
+		/obj/structure/trap/damage
 	)
-	summon_lifespan = 0
+	summon_lifespan = 3000
 	summon_amt = 5
 
 	action_icon_state = "the_traps"
+
+/obj/effect/proc_holder/spell/aoe_turf/conjure/the_traps/post_summon(obj/structure/trap/T, mob/user)
+	T.immune_minds += user.mind
+	T.charges = 1