Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192

Conflicts:
	code/modules/clothing/head/misc.dm

code/modules/projectiles/projectile/bullets.dm

@@ -80,7 +80,7 @@
 	on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
 		if(istype(target, /mob/living/carbon))
 			var/mob/living/carbon/M = target
-			if(M.can_inject(target_zone = hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+			if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
 				reagents.trans_to(M, reagents.total_volume)
 				return 1
 			else

code/modules/projectiles/projectile/magic.dm

@@ -193,6 +193,9 @@ proc/wabbajack(mob/living/M)
 			for (var/obj/effect/proc_holder/spell/S in M.spell_list)
 				new_mob.spell_list += new S.type
 
+			new_mob.attack_log = M.attack_log
+			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
+
 			new_mob.a_intent = "harm"
 			if(M.mind)
 				M.mind.transfer_to(new_mob)