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

Conflicts:
	code/modules/projectiles/guns/magic.dm

code/modules/projectiles/ammunition.dm

@@ -3,7 +3,7 @@
 	desc = "A bullet casing."
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "s-casing"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 1
 	w_class = 1.0
@@ -41,7 +41,7 @@
 	desc = "A box of ammo."
 	icon_state = "357"
 	icon = 'icons/obj/ammo.dmi'
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "syringe_kit"
 	m_amt = 50000

code/modules/projectiles/gun.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "detective"
 	item_state = "gun"
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BELT
 	m_amt = 2000
 	w_class = 3.0

code/modules/projectiles/guns/energy/special.dm

@@ -4,7 +4,7 @@
 	icon_state = "ionrifle"
 	origin_tech = "combat=2;magnets=4"
 	w_class = 5
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/ion)
 
@@ -102,4 +102,4 @@
 	name = "mind flayer"
 	desc = "A prototype weapon recovered from the ruins of Research-Station Epsilon."
 	icon_state = "xray"
-	ammo_type = list(/obj/item/ammo_casing/energy/mindflayer)
+	ammo_type = list(/obj/item/ammo_casing/energy/mindflayer)

code/modules/projectiles/guns/magic.dm

@@ -5,8 +5,7 @@
 	icon_state = "staffofnothing"
 	item_state = "staff"
 	fire_sound = 'sound/weapons/emitter.ogg'
-	var/ammo_type = /obj/item/ammo_casing/magic
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	w_class = 5
 	var/max_charges = 6
 	var/charges = 0
@@ -15,7 +14,6 @@
 	var/can_charge = 1
 	origin_tech = null
 	clumsy_check = 0
-
 /obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag)
 	newshot()
 	..()

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -5,7 +5,7 @@
 	item_state = "shotgun"
 	w_class = 4.0
 	force = 10
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	origin_tech = "combat=4;materials=2"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot
@@ -65,7 +65,7 @@
 	item_state = "shotgun"
 	w_class = 4.0
 	force = 10
-	flags =  FPRINT | TABLEPASS | CONDUCT
+	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	origin_tech = "combat=3;materials=1"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/dualshot

code/modules/projectiles/projectile.dm

@@ -16,7 +16,6 @@
 	density = 1
 	unacidable = 1
 	anchored = 1 //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots.
-	flags = FPRINT | TABLEPASS
 	pass_flags = PASSTABLE
 	mouse_opacity = 0
 	var/bumped = 0		//Prevents it from hitting more than one guy at once

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)