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

Conflicts:
	code/game/turfs/simulated/floor.dm

code/modules/mining/equipment_locker.dm

@@ -471,6 +471,13 @@
 	force = 10
 	throwforce = 10
 	var/cooldown = 0
+	var/list/can_be_placed_into = list(
+		/obj/structure/table,
+		/obj/structure/closet,
+		/obj/item/weapon/storage,
+		/obj/structure/safe,
+		/obj/machinery/disposal
+		)
 
 /obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
 	if(cooldown <= 0)
@@ -489,6 +496,9 @@
 	if(target in user.contents)
 		return
 	if(proximity_flag)
+		for(var/type in can_be_placed_into)
+			if(istype(target, type))
+				return
 		CreateResonance(target, user)
 
 /obj/effect/resonance
@@ -702,7 +712,8 @@
 				if(istype(target, /mob/living/simple_animal/hostile))
 					var/mob/living/simple_animal/hostile/H = M
 					if(malfunctioning)
-						M.faction = list("lazarus")
+						H.faction |= list("lazarus", "\ref[user]")
+						H.robust_searching = 1
 						H.friends += user
 						H.attack_same = 1
 						log_game("[user] has revived hostile mob [target] with a malfunctioning lazarus injector")

code/modules/mining/ores_coins.dm

@@ -152,7 +152,7 @@
 		if(triggered_by_explosive)
 			log_game("An explosion has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
 		else
-			user.visible_message("<span class='warning'>[user] strikes the [src], causing a chain reaction!</span>")
+			user.visible_message("<span class='warning'>[user] strikes \the [src], causing a chain reaction!</span>")
 			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
 		spawn(det_time)
 		if(primed)