Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm

code/modules/spells/spell_code.dm

@@ -189,7 +189,11 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
 	if(silenced > 0)
 		return
 
-	if(user.z == 2 && spell_flags & Z2NOCAST) //Certain spells are not allowed on the centcomm zlevel
+	var/turf/Turf = get_turf(user)
+	if(!Turf)
+		user << "<span class='warning'>You cannot cast spells in null space!</span>"
+
+	if(spell_flags & Z2NOCAST && (Turf.z in config.admin_levels)) //Certain spells are not allowed on the centcomm zlevel
 		return 0
 
 	if(spell_flags & CONSTRUCT_CHECK)

code/modules/spells/spellbook.dm

@@ -256,7 +256,6 @@
 							if (!(XRAY in H.mutations))
 								H.mutations.Add(XRAY)
 								H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
-								H.see_in_dark = 8
 								H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
 								H << "\blue The walls suddenly disappear."
 							temp = "You have purchased a scrying orb, and gained x-ray vision."
@@ -288,6 +287,7 @@
 	for(var/spell/knownspell in user.spell_list)
 		if(knownspell.type == S.type)
 			if(user.mind)
+				// TODO: Update to new antagonist system.
 				if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard")
 					user <<"<span class='notice'>You're already far more versed in this spell than this flimsy how-to book can provide.</span>"
 				else

code/modules/spells/targeted/ethereal_jaunt.dm

@@ -36,7 +36,7 @@
 			target.transforming=0 //mob is safely inside holder now, no need for protection.
 			jaunt_steam(mobloc)
 			sleep(duration)
-			mobloc = get_turf(target.loc)
+			mobloc = holder.last_valid_turf
 			animation.loc = mobloc
 			jaunt_steam(mobloc)
 			target.canmove = 0
@@ -75,6 +75,11 @@
 	var/reappearing = 0
 	density = 0
 	anchored = 1
+	var/turf/last_valid_turf
+
+/obj/effect/dummy/spell_jaunt/New(var/location)
+	..()
+	last_valid_turf = get_turf(location)
 
 /obj/effect/dummy/spell_jaunt/Destroy()
 	// Eject contents if deleted somehow
@@ -87,6 +92,9 @@
 	var/turf/newLoc = get_step(src,direction)
 	if(!(newLoc.flags & NOJAUNT))
 		loc = newLoc
+		var/turf/T = get_turf(loc)
+		if(!T.contains_dense_objects())
+			last_valid_turf = T
 	else
 		user << "<span class='warning'>Some strange aura is blocking the way!</span>"
 	src.canmove = 0

code/modules/spells/targeted/mind_transfer.dm

@@ -12,6 +12,7 @@
 	cooldown_min = 200 //100 deciseconds reduction per rank
 	compatible_mobs = list(/mob/living/carbon/human) //which types of mobs are affected by the spell. NOTE: change at your own risk
 
+	// TODO: Update to new antagonist system.
 	var/list/protected_roles = list("Wizard","Changeling","Cultist") //which roles are immune to the spell
 	var/msg_wait = 500 //how long in deciseconds it waits before telling that body doesn't feel right or mind swap robbed of a spell
 	amt_paralysis = 20 //how much the victim is paralysed for after the spell