Lazarus-injected mobs are ignored by secbots and turrets. (Fixes Redmine #66)

This commit is contained in:
Rob Nelson
2014-02-21 22:06:42 -08:00
committed by ZomgPonies
parent 347bce3c06
commit 2bc90ead02
3 changed files with 11 additions and 5 deletions
+1 -1
View File
@@ -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()
+4 -2
View File
@@ -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
+6 -2
View File
@@ -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