Merge remote-tracking branch 'bay12-upstream/master' into development

code/modules/spells/aoe_turf/conjure/conjure.dm

@@ -45,7 +45,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
 		var/atom/summoned_object
 		if(ispath(summoned_object_type,/turf))
 			if(istype(get_turf(user),/turf/simulated/shuttle) || istype(spawn_place, /turf/simulated/shuttle))
-				user << "<span class='warning>You can't build things on shuttles!</span>"
+				user << "<span class='warning'>You can't build things on shuttles!</span>"
 				continue
 			spawn_place.ChangeTurf(summoned_object_type)
 			summoned_object = spawn_place

code/modules/spells/aoe_turf/conjure/construct.dm

@@ -30,7 +30,7 @@
 	invocation = "none"
 	invocation_type = SpI_NONE
 	range = 0
-	summon_type = list(/turf/simulated/floor/engine/cult)
+	summon_type = list(/turf/simulated/floor/cult)
 
 	hud_state = "const_floor"
 

code/modules/spells/artifacts.dm

@@ -13,6 +13,10 @@
 	hitsound = 'sound/items/welder2.ogg'
 
 /obj/item/weapon/scrying/attack_self(mob/user as mob)
+	if((user.mind && !wizards.is_antagonist(user.mind)))
+		user << "<span class='warning'>You stare into the orb and see nothing but your own reflection.</span>"
+		return
+
 	user << "<span class='info'>You can see... everything!</span>"
 	visible_message("<span class='danger'>[user] stares into [src], their eyes glazing over.</span>")
 	

code/modules/spells/construct_spells.dm

@@ -2,8 +2,6 @@
 
 proc/findNullRod(var/atom/target)
 	if(istype(target,/obj/item/weapon/nullrod))
-		var/turf/T = get_turf(target)
-		T.turf_animation('icons/effects/96x96.dmi',"nullding",-32,-32,MOB_LAYER+1,'sound/piano/Ab7.ogg')
 		return 1
 	else if(target.contents)
 		for(var/atom/A in target.contents)

code/modules/spells/spellbook.dm

@@ -14,6 +14,10 @@
 /obj/item/weapon/spellbook/attack_self(mob/user = usr)
 	if(!user)
 		return
+	if((user.mind && !wizards.is_antagonist(user.mind)))
+		usr << "<span class='warning'>You stare at the book but cannot make sense of the markings!</span>"
+		return
+
 	user.set_machine(src)
 	var/dat
 	if(temp)
@@ -251,7 +255,7 @@
 								H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 								H.see_in_dark = 8
 								H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
-								H << "span class='notice'>The walls suddenly disappear.</span>"
+								H << "<span class='notice'>The walls suddenly disappear.</span>"
 							temp = "You have purchased a scrying orb, and gained x-ray vision."
 							max_uses--
 		else

code/modules/spells/targeted/ethereal_jaunt.dm

@@ -16,7 +16,7 @@
 
 /spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
 	for(var/mob/living/target in targets)
-		target.monkeyizing = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
+		target.transforming = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
 		if(target.buckled) target.buckled = null
 		spawn(0)
 			var/mobloc = get_turf(target.loc)
@@ -33,7 +33,7 @@
 				target.buckled = null
 			jaunt_disappear(animation, target)
 			target.loc = holder
-			target.monkeyizing=0 //mob is safely inside holder now, no need for protection.
+			target.transforming=0 //mob is safely inside holder now, no need for protection.
 			jaunt_steam(mobloc)
 			sleep(duration)
 			mobloc = holder.last_valid_turf

code/modules/spells/targeted/projectile/projectile.dm

@@ -15,7 +15,7 @@ If the spell_projectile is seeking, it will update its target every process and
 	var/proj_step_delay = 1 //lower = faster
 	var/cast_prox_range = 1
 
-/spell/targeted/projectile/cast(list/targets, mob/user = usr)
+/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone)
 
 	if(istext(proj_type))
 		proj_type = text2path(proj_type) // sanity filters
@@ -26,19 +26,14 @@ If the spell_projectile is seeking, it will update its target every process and
 		if(!projectile)
 			return
 
-		projectile.original = target
-		projectile.starting = get_turf(user)
+
 		projectile.shot_from = user //fired from the user
-		projectile.current = projectile.original
-		projectile.yo = target.y - user.y
-		projectile.xo = target.x - user.x
-		projectile.kill_count = src.duration
 		projectile.hitscan = !proj_step_delay
 		projectile.step_delay = proj_step_delay
 		if(istype(projectile, /obj/item/projectile/spell_projectile))
 			var/obj/item/projectile/spell_projectile/SP = projectile
 			SP.carried = src //casting is magical
-		projectile.launch(target)
+		projectile.launch(target, target_zone="chest")
 	return
 
 /spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)

code/modules/spells/targeted/subjugate.dm

@@ -7,13 +7,13 @@
 	spell_flags = 0
 	invocation = "DII ODA BAJI"
 	invocation_type = SpI_WHISPER
-	message = "<span class='danger'>You suddenly feel completely overwhelmed!<span>"
+	message = "<span class='danger'>You suddenly feel completely overwhelmed!</span>"
 
 	max_targets = 1
 
-	amt_dizziness = 150
-	amt_confused = 150
-	amt_stuttering = 150
+	amt_dizziness = 100
+	amt_confused = 100
+	amt_stuttering = 100
 
 	compatible_mobs = list(/mob/living/carbon/human)