Merge branch 'master' into upstream-merge-33246

code/modules/spells/spell_types/conjure.dm

@@ -56,6 +56,18 @@
 	range = 3
 	newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot")
 
+/obj/effect/proc_holder/spell/aoe_turf/conjure/linkWorlds
+	name = "Link Worlds"
+	desc = "A whole new dimension for you to play with! They won't be happy about it, though."
+	invocation = "WTF"
+	clothes_req = FALSE
+	charge_max = 600
+	cooldown_min = 200
+	summon_type = list(/mob/living/simple_animal/hostile/spawner/nether)
+	summon_amt = 1
+	range = 1
+	cast_sound = 'sound/weapons/marauder.ogg'
+
 /obj/effect/proc_holder/spell/targeted/conjure_item
 	name = "Summon weapon"
 	desc = "A generic spell that should not exist.  This summons an instance of a specific type of item, or if one already exists, un-summons it.  Summons into hand if possible."

code/modules/spells/spell_types/wizard.dm

@@ -209,7 +209,7 @@
 	summon_amt = 10
 	range = 3
 
-	summon_type = list(/mob/living/simple_animal/hostile/creature)
+	summon_type = list(/mob/living/simple_animal/hostile/netherworld)
 	cast_sound = 'sound/magic/summonitems_generic.ogg'
 
 /obj/effect/proc_holder/spell/targeted/trigger/blind
@@ -289,7 +289,7 @@
 				var/mob/living/M = AM
 				M.Knockdown(stun_amt)
 				to_chat(M, "<span class='userdanger'>You're thrown back by [user]!</span>")
-			AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user)//So stuff gets tossed around at the same time.
+			AM.throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user)//So stuff gets tossed around at the same time.
 
 /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno //i fixed conflicts only to find out that this is in the WIZARD file instead of the xeno file?!
 	name = "Tail Sweep"