From 2bc90ead02b415ea7f62ffb07fdc623663f177a8 Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Fri, 21 Feb 2014 22:06:42 -0800
Subject: [PATCH] Lazarus-injected mobs are ignored by secbots and turrets.
 (Fixes Redmine #66)

---
 code/game/machinery/bots/bots.dm       | 2 +-
 code/game/machinery/bots/secbot.dm     | 6 ++++--
 code/game/machinery/portable_turret.dm | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index c759a153570..38834b4ef6a 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -64,7 +64,7 @@
 	if(M.melee_damage_upper == 0)	return
 	src.health -= M.melee_damage_upper
 	src.visible_message("\red <B>[M] has [M.attacktext] [src]!</B>")
-	M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name]</font>")
+	add_logs(M, src, "attacked", admin=0)
 	if(prob(10))
 		new /obj/effect/decal/cleanable/oil(src.loc)
 	healthcheck()
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index f37df2fe13c..e1b9c645f83 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -611,8 +611,10 @@ Auto Patrol: []"},
 		else if(istype(M, /mob/living/simple_animal/hostile))
 			if(M.stat == DEAD)
 				continue
-			else
-				src.threatlevel = 4
+			// Ignore lazarus-injected mobs.
+			if(M.faction == "lazarus")
+				continue
+			src.threatlevel = 4
 
 		if(!src.threatlevel)
 			continue
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index c6c24a25f40..ba028d9a736 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -450,8 +450,12 @@ Status: []<BR>"},
 
 	if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"(And simple_animals)
 		for(var/mob/living/simple_animal/C in view(7,src))
-			if(!C.stat)
-				targets += C
+			if(C.stat)
+				continue
+			// Ignore lazarus-injected mobs.
+			if(M.faction == "lazarus")
+				continue
+			targets += C
 
 	for (var/mob/living/carbon/C in view(7,src)) // loops through all living carbon-based lifeforms in view(12)
 		if(istype(C, /mob/living/carbon/alien) && src.check_anomalies) // git those fukken xenos