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

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)